diff --git a/g10/ChangeLog b/g10/ChangeLog
index 2945f7400..e2e937859 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-09  David Shaw  <dshaw@jabberwocky.com>
+
+	* g10.c (add_group): Use '=' to separate group name from group
+	members.  Use a better error message for when no = is found.
+
+	* hkp.c (hkp_export): Use CRLF in headers.
+
 2002-09-03  David Shaw  <dshaw@jabberwocky.com>
 
 	* mainproc.c (print_pkenc_list): Don't increment the error counter
diff --git a/g10/g10.c b/g10/g10.c
index 1bbf5d592..ca0f28ade 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -816,10 +816,10 @@ static void add_group(char *string)
   STRLIST values=NULL;
 
   /* Break off the group name */
-  name=strsep(&string," ");
+  name=strsep(&string,"=");
   if(string==NULL)
     {
-      log_error(_("no values for group \"%s\"\n"),name);
+      log_error(_("no = sign found in group definition \"%s\"\n"),name);
       return;
     }
 
diff --git a/g10/hkp.c b/g10/hkp.c
index 204d4ec1a..00d5c1196 100644
--- a/g10/hkp.c
+++ b/g10/hkp.c
@@ -157,7 +157,7 @@ hkp_export( STRLIST users )
 	return rc;
     }
 
-    sprintf( request, "Content-Length: %u\n",
+    sprintf( request, "Content-Length: %u\r\n",
 		      (unsigned)iobuf_get_temp_length(temp) + 9 );
     iobuf_writestr( hd.fp_write, request );
     m_free( request );