diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 62a5cbc4c..905701304 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,5 +1,7 @@
 2002-08-27  David Shaw  <dshaw@jabberwocky.com>
 
+	* gpgkeys_hkp.c (http_get, http_post): Use CRLF for line endings.
+
 	* gpgkeys_hkp.c: Include util.h on RISC OS as per Stefan.  Include
 	a replacement for hstrerror() for those platforms (such as RISC
 	OS) that don't have it.
diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c
index f3dc4ec28..3936e474e 100644
--- a/keyserver/gpgkeys_hkp.c
+++ b/keyserver/gpgkeys_hkp.c
@@ -144,7 +144,7 @@ void http_disconnect(void)
 
 int http_get(const char *op,const char *search)
 {
-  fprintf(server,"GET /pks/lookup?op=%s&search=%s HTTP/1.0\n\n",op,search);
+  fprintf(server,"GET /pks/lookup?op=%s&search=%s HTTP/1.0\r\n\r\n",op,search);
 
   if(verbose>2)
     fprintf(console,"gpgkeys: HTTP GET /pks/lookup?op=%s&search=%s HTTP/1.0\n",
@@ -159,9 +159,9 @@ int http_post(const char *data)
   int result;
 
   fprintf(server,
-	  "POST /pks/add HTTP/1.0\n"
+	  "POST /pks/add HTTP/1.0\r\n"
 	  "Content-type: application/x-www-form-urlencoded\n"
-	  "Content-Length: %d\n\n%s",strlen(data),data);
+	  "Content-Length: %d\r\n\r\n%s",strlen(data),data);
 
   if(verbose>2)
     fprintf(console,