diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 0831eebb8..ec8ed3a19 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,14 @@
+2002-07-01  David Shaw  <dshaw@jabberwocky.com>
+
+	* gpgkeys_hkp.c (parse_hkp_index): Error if the keyserver returns
+	an unparseable HKP response.
+
+	* gpgkeys_hkp.c (main): Warn on honor-http-proxy,
+	broken-http-proxy, and include-subkeys (not supported yet).
+
+	* gpgkeys_ldap.c (main), gpgkeys_hkp.c (http_connect, main): Fix
+	some shadowing warnings.
+
 2002-06-11  David Shaw  <dshaw@jabberwocky.com>
 
 	* Makefile.am: Don't hard-code the LDAP libraries - get them from
diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c
index 24bc9cb0d..76b3cc87f 100644
--- a/keyserver/gpgkeys_hkp.c
+++ b/keyserver/gpgkeys_hkp.c
@@ -48,7 +48,7 @@ struct keylist
   struct keylist *next;
 };
 
-int http_connect(const char *host,unsigned short port)
+int http_connect(const char *http_host,unsigned short port)
 {
   int sock=-1;
   struct hostent *ent;
@@ -61,7 +61,7 @@ int http_connect(const char *host,unsigned short port)
       goto fail;
     }
 
-  ent=gethostbyname(host);
+  ent=gethostbyname(http_host);
   if(ent==NULL)
     {
       fprintf(console,"gpgkeys: DNS error: %s\n",hstrerror(h_errno));
@@ -88,7 +88,8 @@ int http_connect(const char *host,unsigned short port)
     }
 
   if(verbose>3)
-    fprintf(console,"gpgkeys: HKP connect to %s:%d\n",host,port?port:11371);
+    fprintf(console,"gpgkeys: HKP connect to %s:%d\n",
+	    http_host,port?port:11371);
 
   return 0;
 
@@ -397,10 +398,26 @@ unsigned int scan_isodatestr( const char *string )
 int parse_hkp_index(char *line,char **buffer)
 {
   static int open=0,revoked=0;
-  static char *key,*uid;
+  static char *key=NULL,*uid=NULL;
   static unsigned int bits,createtime;
   int ret=0;
 
+  /* printf("Open %d, LINE: %s, uid: %s\n",open,line,uid); */
+
+  /* Try and catch some bastardization of HKP.  If we don't have
+     certain unchanging landmarks, we can't reliably parse the
+     response. */
+
+  if(open && strncasecmp(line,"</pre>",6)!=0 &&
+     strncasecmp(line,"pub ",5)!=0 &&
+     strncasecmp(line,"     ",5)!=0)
+    {
+      free(key);
+      free(uid);
+      fprintf(console,"gpgkeys; this keyserver is not fully HKP compatible\n");
+      return -1;
+    }
+
   /* printf("Open %d, LINE: %s\n",open,line); */
 
   /* For multiple UIDs */
@@ -640,7 +657,7 @@ int search_key(char *searchkey)
     }
 
   fprintf(output,"COUNT %d\n%s",count,buffer);
-  //  fprintf(output,"COUNT -1\n%s",buffer);
+  /* fprintf(output,"COUNT -1\n%s",buffer); */
 
   fprintf(output,"SEARCH %s END\n",searchkey);
 
@@ -789,6 +806,13 @@ int main(int argc,char *argv[])
 	      else
 		include_revoked=1;
 	    }
+	  else if(strcasecmp(start,"honor-http-proxy")==0 ||
+		  strcasecmp(start,"broken-http-proxy")==0 ||
+		  strcasecmp(start,"include-subkeys")==0)
+	    {
+	      fprintf(stderr,"gpgkeys: HKP does not currently support %s\n",
+		      start);
+	    }
 
 	  continue;
 	}
@@ -897,17 +921,17 @@ int main(int argc,char *argv[])
 
     case SEND:
       {
-	int ret;
+	int ret2;
 
 	do
 	  {
 	    http_connect(host,port);
-	    ret=send_key();
-	    if(ret==-1)
+	    ret2=send_key();
+	    if(ret2==-1)
 	      failed++;
 	    http_disconnect();
 	  }
-	while(ret!=1);
+	while(ret2!=1);
       }
       break;
 
diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c
index fa9edab8d..8471e19bd 100644
--- a/keyserver/gpgkeys_ldap.c
+++ b/keyserver/gpgkeys_ldap.c
@@ -901,15 +901,15 @@ int main(int argc,char *argv[])
 
     case SEND:
       {
-	int ret;
+	int ret2;
 
 	do
 	  {
-	    ret=send_key();
-	    if(ret==-1)
+	    ret2=send_key();
+	    if(ret2==-1)
 	      failed++;
 	  }
-	while(ret!=1);
+	while(ret2!=1);
       }
       break;