diff --git a/g10/ChangeLog b/g10/ChangeLog
index 4e9ddf46e..22077c1ed 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,10 @@
 2006-01-01  David Shaw  <dshaw@jabberwocky.com>
 
+	* mainproc.c (check_sig_and_print), keyserver.c
+	(keyserver_import_pka), card-util.c (fetch_url): Always require a
+	scheme:// for keyserver URLs except when used as part of the
+	--keyserver command for backwards compatibility.
+
 	* sign.c (write_signature_packets): Lost a digest_algo line.
 
 	* sign.c (hash_for): Add code to detect if the sk lives on a smart
diff --git a/g10/card-util.c b/g10/card-util.c
index d9e9d8906..cace1962d 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -623,7 +623,7 @@ fetch_url(void)
 		  gpg_strerror(rc));
       else if (info.pubkey_url && *info.pubkey_url)
 	{
-	  spec=parse_keyserver_uri(info.pubkey_url,0,NULL,0);
+	  spec=parse_keyserver_uri(info.pubkey_url,1,NULL,0);
 	  if(spec && info.fpr1valid)
 	    {
 	      /* This is not perfectly right.  Currently, all card
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 95d8d8d96..214211e31 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -1979,7 +1979,7 @@ keyserver_import_pka(const char *name)
   if (uri)
     {
       struct keyserver_spec *spec;
-      spec = parse_keyserver_uri (uri, 0, NULL, 0);
+      spec = parse_keyserver_uri (uri, 1, NULL, 0);
       if (spec)
 	{
 	  rc=keyserver_import_fprint (fpr, 20, spec);
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 8e512ecb5..7b92d8426 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -1529,7 +1529,7 @@ check_sig_and_print( CTX c, KBNODE node )
             int res;
             struct keyserver_spec *spec;
             
-            spec = parse_keyserver_uri (uri, 0, NULL, 0);
+            spec = parse_keyserver_uri (uri, 1, NULL, 0);
             if (spec)
               {
                 glo_ctrl.in_auto_key_retrieve++;