diff --git a/ChangeLog b/ChangeLog
index 29ca2e026..9731e7bdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-09  David Shaw  <dshaw@jabberwocky.com>
+
+	* NEWS: typo.
+
+	* configure.ac: Add a link test for LDAP without -lresolv for
+	HPUX.  Remove "hstrerror" test as it is no longer needed.
+
 2002-09-02  Werner Koch  <wk@gnupg.org>
 
 	* README: Removed the note about a development version so that we
diff --git a/NEWS b/NEWS
index fd45b7e12..38e90ca20 100644
--- a/NEWS
+++ b/NEWS
@@ -14,7 +14,7 @@ Noteworthy changes in version 1.1.92
       with other programs (most commonly PGP earlier than version 7.x)
       that do not support MDCs.
 
-    * The option --interactive has now the desired effect when
+    * The option --interactive now has the desired effect when
       importing keys.
 
     * The file permission and ownership checks on files have been
@@ -77,6 +77,7 @@ Noteworthy changes in version 1.1.91 (2002-08-04)
     * The LDAP keyserver handler now works properly with very old
       (version 1) LDAP keyservers.
 
+
 Noteworthy changes in version 1.1.90 (2002-07-01)
 -------------------------------------------------
 
diff --git a/configure.ac b/configure.ac
index 2dd48bd7d..c052e16d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -355,11 +355,11 @@ AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt,
 	[NETLIBS="-lsocket $NETLIBS"]))
 
 # Try and link a LDAP test program to weed out unusable LDAP
-# libraries.  -lldap -llber -lresolv is for OpenLDAP.  -lldapssl41 is
-# for Mozilla LDAP.
+# libraries.  -lldap -llber [-lresolv] is for OpenLDAP.  -lldapssl41
+# is for Mozilla LDAP.
 
 if test "$try_ldap" = yes ; then
-  for LDAPLIBS in "-lldap -llber -lresolv" "-lldapssl41"; do
+  for LDAPLIBS in "-lldap -llber -lresolv" "-lldap -llber" "-lldapssl41"; do
     _ldap_save_libs=$LIBS
     LIBS="$LDAPLIBS $NETLIBS $LIBS"
 
@@ -536,7 +536,7 @@ AC_FUNC_FSEEKO
 AC_FUNC_VPRINTF
 AC_FUNC_FORK
 AC_CHECK_FUNCS(strerror stpcpy strsep strlwr tcgetattr strtoul mmap)
-AC_CHECK_FUNCS(strcasecmp strncasecmp hstrerror)
+AC_CHECK_FUNCS(strcasecmp strncasecmp)
 AC_CHECK_FUNCS(memmove gettimeofday getrusage setrlimit clock_gettime)
 AC_CHECK_FUNCS(atexit raise getpagesize strftime nl_langinfo setlocale)
 AC_CHECK_FUNCS(waitpid wait4 sigaction sigprocmask rand pipe stat)