diff --git a/g10/ChangeLog b/g10/ChangeLog
index 0d9ba8c9c..91b19ae43 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-04  David Shaw  <dshaw@jabberwocky.com>
+
+	* keyserver.c (keyserver_import_cert): Allow keyserver URLs in
+	addition to full URLs in CERT records.
+
 2008-08-11  Werner Koch  <wk@g10code.com>
 
 	* keygen.c (ask_expire_interval): Check for time overflow of an
diff --git a/g10/keyserver.c b/g10/keyserver.c
index adeee5935..c50f5961f 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -2018,13 +2018,7 @@ keyserver_import_cert(const char *name,unsigned char **fpr,size_t *fpr_len)
 	  spec=parse_keyserver_uri(url,1,NULL,0);
 	  if(spec)
 	    {
-	      STRLIST list=NULL;
-
-	      add_to_strlist(&list,url);
-
-	      rc=keyserver_fetch(list);
-
-	      free_strlist(list);
+	      rc=keyserver_import_fprint(*fpr,*fpr_len,spec);
 	      free_keyserver_spec(spec);
 	    }
 	}