diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 2d2d303de8..33e55a4abf 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr  8 12:09:36 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.host: Set HLDFLAGS and SHLIB_CFLAGS for *-dec-osf*
+	host when configuring with --enable-shard.
+
 Fri Apr  5 12:24:13 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* config.bfd: Add i[345]86-*-freebsdelf* target; from John Polstra
diff --git a/bfd/configure.host b/bfd/configure.host
index 320faa4df7..73d69fd439 100644
--- a/bfd/configure.host
+++ b/bfd/configure.host
@@ -71,6 +71,8 @@ if [ "${shared}" = "true" ]; then
   *-dec-osf*)
     # -fpic is not needed on the Alpha.
     PICFLAG=
+    HLDFLAGS='-rpath $(libdir)'
+    SHLIB_CFLAGS='-shared -Wl,-soname,$(SONAME)'
     ;;
   *-*-hpux*)
     # HP/UX uses .sl for shared libraries.
@@ -89,7 +91,10 @@ if [ "${shared}" = "true" ]; then
     ;;
   *-*-linux*)
     SHLIB_CFLAGS='-shared -Wl,-soname,$(SONAME)'
-    HLDFLAGS='-Wl,-rpath,$(libdir)'
+    case "$(libdir)" in
+      /lib | /usr/lib) ;;
+      *) HLDFLAGS='-Wl,-rpath,$(libdir)' ;;
+    esac
     ;;
   *-*-sysv4* | *-*-solaris*)
     SHLIB_CFLAGS='-shared -h $(SONAME)'