diff --git a/g10/ChangeLog b/g10/ChangeLog
index a460b97ae..8f26dfb90 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-20  David Shaw  <dshaw@jabberwocky.com>
+
+	* keyserver.c (parse_keyserver_uri): Do not accept "http" as an
+	alias for "hkp".  They are not the same thing.
+
 2004-04-19  David Shaw  <dshaw@jabberwocky.com>
 
 	* options.h, g10.c (main): Add keyserver-option
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 3670f6d13..8b71a6340 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -184,8 +184,7 @@ parse_keyserver_uri(char *uri,const char *configname,unsigned int configlineno)
       scheme="hkp";
       add_to_strlist(&opt.keyserver_options.other,"broken-http-proxy");
     }
-  else if(ascii_strcasecmp(scheme,"x-hkp")==0
-	  || ascii_strcasecmp(scheme,"http")==0)
+  else if(ascii_strcasecmp(scheme,"x-hkp")==0)
     {
       /* Canonicalize this to "hkp" so it works with both the internal
 	 and external keyserver interface. */