diff --git a/ChangeLog b/ChangeLog
index ff0a48a88..ab6c4e023 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-12  Oliver Kiddle  <opk@zsh.org>
+
+	* 19616: configure.ac: use correct shared library link options
+	for gcc on HP/UX
+
 2004-03-12  Clint Adams  <clint@zsh.org>
 
 	* 19614: Completion/Unix/Command/_mtr: better descriptions
@@ -57,7 +62,7 @@
 	Cygwin not to use pattern matching if only the case-insensitive
 	flag is on.
 
-	* 19553: Index: Src/Zle/complist.c, Src/Zle/zle_hist.c,
+	* 19553: Src/Zle/complist.c, Src/Zle/zle_hist.c,
 	Src/Zle/zle_keymap.c, Src/Zle/zle_main.c, Src/Zle/zle_misc.c,
 	Src/Zle/zle_move.c, Src/Zle/zle_tricky.c, Src/Zle/zle_vi.c:
 	Rename `c' to `lastchar' and mark for export.
diff --git a/configure.ac b/configure.ac
index 18ff78262..b47111194 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2007,18 +2007,21 @@ char *argv[];
   fi
   if test -n "$GCC"; then
     case "$host_os" in
+      hpux*)   DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
       darwin*) DLCFLAGS="${DLCFLAGS=-fno-common}" ;;
       *)       DLCFLAGS="${DLCFLAGS=-fPIC}" ;;
     esac
   else
     case "$host_os" in
-      hpux*)                 DLCFLAGS="${DLCFLAGS=+z}" ;;
+      hpux*)
+        DLCFLAGS="${DLCFLAGS=+z}"
+        DLLDFLAGS="${DLLDFLAGS=-b}"
+      ;;
       sunos*)                DLCFLAGS="${DLCFLAGS=-pic}" ;;
       solaris*|sysv4*|esix*) DLCFLAGS="${DLCFLAGS=-KPIC}" ;;
     esac
   fi
   case "$host_os" in
-    hpux*)        DLLDFLAGS="${DLLDFLAGS=-b}" ;;
     freebsd*|linux*|irix*|osf*|gnu*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
     sunos*)       DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;;
     sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;;