diff --git a/ld/ChangeLog b/ld/ChangeLog
index 1a2371611c..5fc08063bc 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,7 @@
 Tue Feb 13 14:04:19 1996  Ian Lance Taylor  <ian@cygnus.com>
 
+	* configure.host: Set HDLFLAGS for *-*-hpux with --enable-shared.
+
 	* emultempl/elf32.em (gld${EMULATION_NAME}_stat_needed): Warn if
 	it looks like we might be linking in two different versions of the
 	same shared library.  Based on a patch from H J Lu <hjl@zoom.com>.
diff --git a/ld/configure.host b/ld/configure.host
index 8d43d7eea7..9d0b6282a9 100644
--- a/ld/configure.host
+++ b/ld/configure.host
@@ -136,6 +136,9 @@ HLDFLAGS=
 # If we have shared libraries, try to set rpath reasonably.
 if test "${shared}" = "true"; then
   case "${host}" in
+  *-*-hpux*)
+    HLDFLAGS='-Wl,+s,+b,$(libdir)'
+    ;;
   *-*-irix5*)
     HLDFLAGS='-Wl,-rpath,$(libdir)'
     ;;