diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index d691664768..3b83f4bec3 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-10  Nick Clifton  <nickc@redhat.com>
+
+	PR 6937
+	* configure.in (SHARED_LIBADD): Add libiberty.a.
+	(SHARED_DEPENDENCIES): Add libiberty.a.
+
 2008-09-30  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* i386-gen.c: Include "hashtab.h".
diff --git a/opcodes/configure b/opcodes/configure
index 62750de6f3..33c246b22c 100755
--- a/opcodes/configure
+++ b/opcodes/configure
@@ -12436,10 +12436,10 @@ if test "$enable_shared" = "yes"; then
           SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.sl"
 	  ;;
 	*)
-          SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.so"
+          SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.so -Wl,`pwd`/../libiberty/libiberty.a"
 	  ;;
       esac
-      SHARED_DEPENDENCIES="../bfd/libbfd.la"
+      SHARED_DEPENDENCIES="../bfd/libbfd.la ../libiberty/libiberty.a"
       ;;
   esac
 fi
diff --git a/opcodes/configure.in b/opcodes/configure.in
index 2800eed750..061bb716a2 100644
--- a/opcodes/configure.in
+++ b/opcodes/configure.in
@@ -118,10 +118,10 @@ if test "$enable_shared" = "yes"; then
           SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.sl"
 	  ;;
 	*)
-          SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.so"
+          SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.so -Wl,`pwd`/../libiberty/libiberty.a"
 	  ;;
       esac
-      SHARED_DEPENDENCIES="../bfd/libbfd.la"
+      SHARED_DEPENDENCIES="../bfd/libbfd.la ../libiberty/libiberty.a"
       ;;
   esac
 fi