diff --git a/g10/ChangeLog b/g10/ChangeLog
index 9b1f0336a..85aff8786 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-26  David Shaw  <dshaw@jabberwocky.com>
+
+	* keyserver.c (keyserver_typemap): Special-case LDAP since curl
+	will report that it can handle it, and we don't want it to.
+
 2005-07-26  Werner Koch  <wk@g10code.com>
 
 	* passphrase.c (agent_get_passphrase): Make sure to release the
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 2ce03d41e..574a53414 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -860,7 +860,9 @@ curl_can_handle(const char *scheme)
 static const char *
 keyserver_typemap(const char *type)
 {
-  if(strcmp(type,"ldaps")==0)
+  if(strcmp(type,"ldap")==0)
+    return "ldap";
+  else if(strcmp(type,"ldaps")==0)
     return "ldap";
   else if(curl_can_handle(type))
     return "curl";