diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 2a1b95930..3511889c5 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-03  David Shaw  <dshaw@jabberwocky.com>
+
+	* gpgkeys_hkp.c (search_key): HKP keyservers like the 0x to be
+	present when searching by keyID.
+
 2006-11-22  Werner Koch  <wk@g10code.com>
 
 	* Makefile.am (gpg2keys_ldap_LDADD): Add jnlib.  This is needed
diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c
index 19c96bae6..e393b856c 100644
--- a/keyserver/gpgkeys_hkp.c
+++ b/keyserver/gpgkeys_hkp.c
@@ -426,6 +426,12 @@ search_key(const char *searchkey)
     strcat(request,"11371");
   strcat(request,opt->path);
   append_path(request,"/pks/lookup?op=index&options=mr&search=");
+
+  /* HKP keyservers like the 0x to be present when searching by
+     keyid */
+  if(search_type==KS_SEARCH_KEYID_SHORT || search_type==KS_SEARCH_KEYID_LONG)
+    strcat(request,"0x");
+
   strcat(request,searchkey_encoded);
 
   if(search_type!=KS_SEARCH_SUBSTR)