diff --git a/sm/ChangeLog b/sm/ChangeLog
index fbdf15f6c..4a2825efe 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,7 @@
+2003-10-25  Werner Koch  <wk@gnupg.org>
+
+	* certreqgen.c (read_parameters): Fixed faulty of !spacep().
+
 2003-08-20  Marcus Brinkmann  <marcus@g10code.de>
 
 	* encrypt.c (encode_session_key): Allocate enough space.  Cast key
diff --git a/sm/certreqgen.c b/sm/certreqgen.c
index 0dd4fdde9..efb3e8c1a 100644
--- a/sm/certreqgen.c
+++ b/sm/certreqgen.c
@@ -270,7 +270,7 @@ read_parameters (FILE *fp, KsbaWriter writer)
       keyword = p;
       if (*keyword == '%')
         {
-          for (; !spacep (p); p++)
+          for (; *p && !spacep (p); p++)
             ;
           if (*p)
             *p++ = 0;