diff --git a/assuan/ChangeLog b/assuan/ChangeLog
index e79c2ba14..87c88fef7 100644
--- a/assuan/ChangeLog
+++ b/assuan/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-14  Werner Koch  <wk@gnupg.org>
+
+	* assuan-client.c (_assuan_read_from_server): Skip spaces after
+	the keyword.
+
 2002-01-03  Werner Koch  <wk@gnupg.org>
 
 	* assuan-handler.c (assuan_set_okay_line): New.
diff --git a/assuan/assuan-client.c b/assuan/assuan-client.c
index a555cf339..d56357dc6 100644
--- a/assuan/assuan-client.c
+++ b/assuan/assuan-client.c
@@ -63,6 +63,8 @@ _assuan_read_from_server (ASSUAN_CONTEXT ctx, int *okay, int *off)
     {
       *okay = 1;
       *off = 2;
+      while (line[*off] == ' ')
+        ++*off;
     }
   else if (linelen >= 3
            && line[0] == 'E' && line[1] == 'R' && line[2] == 'R'
@@ -70,6 +72,8 @@ _assuan_read_from_server (ASSUAN_CONTEXT ctx, int *okay, int *off)
     {
       *okay = 0;
       *off = 3;
+      while (line[*off] == ' ')
+        ++*off;
     }  
   else if (linelen >= 7
            && line[0] == 'I' && line[1] == 'N' && line[2] == 'Q'
@@ -79,6 +83,8 @@ _assuan_read_from_server (ASSUAN_CONTEXT ctx, int *okay, int *off)
     {
       *okay = 3;
       *off = 7;
+      while (line[*off] == ' ')
+        ++*off;
     }
   else
     rc = ASSUAN_Invalid_Response;