diff --git a/g10/ChangeLog b/g10/ChangeLog
index 2a223bb24..9a30073f8 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-11  David Shaw  <dshaw@jabberwocky.com>
+
+	* keyserver.c (parse_preferred_keyserver): Force preferred
+	keyserver subpackets to have a URI scheme specified.
+
 2004-12-10  David Shaw  <dshaw@jabberwocky.com>
 
 	* options.h, g10.c (main), textfilter.c (standard): Use --rfc2440
diff --git a/g10/keyserver.c b/g10/keyserver.c
index b67a53f8c..744ce2cad 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -296,7 +296,7 @@ parse_preferred_keyserver(PKT_signature *sig)
 
       memcpy(dupe,p,plen);
       dupe[plen]='\0';
-      spec=parse_keyserver_uri(dupe,0,NULL,0);
+      spec=parse_keyserver_uri(dupe,1,NULL,0);
       m_free(dupe);
     }