diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 71865b935..4d1fb033c 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-08  David Shaw  <dshaw@jabberwocky.com>
+
+	* gpgkeys_ldap.c (main): Fix error return code.
+
 2002-09-26  Werner Koch  <wk@gnupg.org>
 
 	* gpgkeys_ldap.c (send_key): Removed non-constant initializers.
diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c
index 15a100d67..8448d1977 100644
--- a/keyserver/gpgkeys_ldap.c
+++ b/keyserver/gpgkeys_ldap.c
@@ -839,7 +839,7 @@ int main(int argc,char *argv[])
 
   err=ldap_search_s(ldap,"cn=PGPServerInfo",LDAP_SCOPE_BASE,
 		    "(objectclass=*)",attrs,0,&res);
-  if(err==-1)
+  if(err!=0)
     {
       fprintf(console,"gpgkeys: error retrieving LDAP server info: %s\n",
 	      ldap_err2string(err));