diff -Nru oprofile-0.9.9/debian/changelog oprofile-0.9.9/debian/changelog
--- oprofile-0.9.9/debian/changelog	2014-03-10 21:03:07.000000000 +0000
+++ oprofile-0.9.9/debian/changelog	2014-03-11 02:33:42.000000000 +0000
@@ -1,3 +1,13 @@
+oprofile (0.9.9-0ubuntu7) trusty; urgency=medium
+
+  * Drop debian/patches/static-libbfd-libopagnet-makefile.patch, which is
+    causing libopagent to incorrectly avoid linking with libbfd, instead of
+    linking with the available libbfd.so.
+  * Amend debian/patches/static-libbfd.patch; we'll still link oprofile
+    statically, but we want libopagent linked dynamically.  LP: #1148682.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 11 Mar 2014 02:33:39 +0000
+
 oprofile (0.9.9-0ubuntu6) trusty; urgency=medium
 
   [ Mauricio Faria de Oliveira ]
diff -Nru oprofile-0.9.9/debian/patches/series oprofile-0.9.9/debian/patches/series
--- oprofile-0.9.9/debian/patches/series	2014-03-10 21:02:24.000000000 +0000
+++ oprofile-0.9.9/debian/patches/series	2014-03-10 23:51:07.000000000 +0000
@@ -1,7 +1,6 @@
 timer-mode.patch
 shell-interpreter.patch
 static-libbfd.patch
-static-libbfd-libopagnet-makefile.patch
 changelog-move-to-git-log.patch
 aarch64.patch
 ppc64el.diff
diff -Nru oprofile-0.9.9/debian/patches/static-libbfd-libopagnet-makefile.patch oprofile-0.9.9/debian/patches/static-libbfd-libopagnet-makefile.patch
--- oprofile-0.9.9/debian/patches/static-libbfd-libopagnet-makefile.patch	2012-10-04 09:19:11.000000000 +0000
+++ oprofile-0.9.9/debian/patches/static-libbfd-libopagnet-makefile.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
---- a/libopagent/Makefile.am
-+++ b/libopagent/Makefile.am
-@@ -15,7 +15,7 @@ libopagent_la_CPPFLAGS = -I ${top_srcdir
- 	-I ${top_srcdir}/libutil \
- 	@OP_CPPFLAGS@
- 
--libopagent_la_LIBADD = $(BFD_LIBS)
-+libopagent_la_LIBADD =
- 
- # Do not increment the major version for this library except to
- # intentionally break backward ABI compatability.  Use the
diff -Nru oprofile-0.9.9/debian/patches/static-libbfd.patch oprofile-0.9.9/debian/patches/static-libbfd.patch
--- oprofile-0.9.9/debian/patches/static-libbfd.patch	2012-10-04 09:19:11.000000000 +0000
+++ oprofile-0.9.9/debian/patches/static-libbfd.patch	2014-03-11 02:06:45.000000000 +0000
@@ -1,17 +1,60 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -258,7 +258,7 @@ AX_CHECK_DOCBOOK
+Index: oprofile-0.9.9/configure.ac
+===================================================================
+--- oprofile-0.9.9.orig/configure.ac
++++ oprofile-0.9.9/configure.ac
+@@ -338,7 +338,7 @@
  dnl finally restore the original libs setting
  LIBS="$ORIG_SAVE_LIBS"
  LIBERTY_LIBS="-liberty $DL_LIB $INTL_LIB"
 -BFD_LIBS="-lbfd -liberty $DL_LIB $INTL_LIB $Z_LIB"
-+BFD_LIBS="$BFD_LIB -lz -liberty $DL_LIB $INTL_LIB"
++BFD_LIBS="-liberty $DL_LIB $INTL_LIB $Z_LIB"
  POPT_LIBS="-lpopt"
  AC_SUBST(LIBERTY_LIBS)
  AC_SUBST(BFD_LIBS)
---- a/m4/binutils.m4
-+++ b/m4/binutils.m4
-@@ -9,16 +9,21 @@ AC_CHECK_FUNCS(xcalloc)
+Index: oprofile-0.9.9/pp/Makefile.am
+===================================================================
+--- oprofile-0.9.9.orig/pp/Makefile.am
++++ oprofile-0.9.9/pp/Makefile.am
+@@ -13,7 +13,7 @@
+ 
+ bin_PROGRAMS = opreport opannotate opgprof oparchive
+ 
+-LIBS=@POPT_LIBS@ @BFD_LIBS@
++LIBS=@POPT_LIBS@ /usr/lib/libbfd.a @BFD_LIBS@
+ 
+ pp_common = common_option.cpp common_option.h
+ 
+Index: oprofile-0.9.9/libopagent/Makefile.am
+===================================================================
+--- oprofile-0.9.9.orig/libopagent/Makefile.am
++++ oprofile-0.9.9/libopagent/Makefile.am
+@@ -15,7 +15,7 @@
+ 	-I ${top_srcdir}/libutil \
+ 	@OP_CPPFLAGS@
+ 
+-libopagent_la_LIBADD = $(BFD_LIBS)
++libopagent_la_LIBADD = -lbfd $(BFD_LIBS)
+ 
+ # Do not increment the major version for this library except to
+ # intentionally break backward ABI compatability.  Use the
+Index: oprofile-0.9.9/opjitconv/Makefile.am
+===================================================================
+--- oprofile-0.9.9.orig/opjitconv/Makefile.am
++++ oprofile-0.9.9/opjitconv/Makefile.am
+@@ -8,7 +8,7 @@
+ 
+ bin_PROGRAMS = opjitconv
+ 
+-LIBS = @BFD_LIBS@
++LIBS = /usr/lib/libbfd.a @BFD_LIBS@
+ 
+ needed_libs =  \
+ 	../libutil/libutil.a
+Index: oprofile-0.9.9/m4/binutils.m4
+===================================================================
+--- oprofile-0.9.9.orig/m4/binutils.m4
++++ oprofile-0.9.9/m4/binutils.m4
+@@ -9,16 +9,12 @@
  AC_CHECK_FUNCS(xmemdup)
  AC_CHECK_LIB(dl, dlopen, LIBS="$LIBS -ldl"; DL_LIB="-ldl", DL_LIB="")
  AC_CHECK_LIB(intl, main, LIBS="$LIBS -lintl"; INTL_LIB="-lintl", INTL_LIB="")
@@ -26,19 +69,10 @@
 -		[AC_MSG_ERROR([libz library not found; required by libbfd])])
 -	]
 -)
-+dnl binutils-multiarch does not have /usr/lib/libbfd.a.
-+BFD_LIB=""
-+lib=/usr/lib/libbfd-single.a
-+ORIG_SAVE_LIBS="$LIBS"
++lib=/usr/lib/libbfd.a
 +LIBS="$lib $LIBS"
-+AC_CHECK_FUNCS(bfd_openr, BFD_LIB="$lib",
-+	[LIBS="$ORIG_SAVE_LIBS"
-+	lib=/usr/lib/libbfd.a
-+	ORIG_SAVE_LIBS="$LIBS"
-+	LIBS="$lib $LIBS"
-+	AC_CHECK_FUNCS(bfd_close, BFD_LIB="$lib",
-+		[AC_MSG_ERROR([libfd library not found])])
-+	])
++AC_CHECK_FUNCS(bfd_close, BFD_LIB="$lib",
++	[AC_MSG_ERROR([libfd library not found])])
  
  AC_LANG_PUSH(C)
  # Determine if bfd_get_synthetic_symtab macro is available