diff --git a/sm/ChangeLog b/sm/ChangeLog
index cbe0245ea..3919fe963 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-23  Marcus Brinkmann  <marcus@g10code.de>
+
+	* certreqgen.c (read_parameters): Use ascii_isspace instead of
+	spacep to stop at newline, too.
+
 2010-04-14  Werner Koch  <wk@g10code.com>
 
 	* gpgsm.c (main) [W32CE]: Disable dirmngr for now.
diff --git a/sm/certreqgen.c b/sm/certreqgen.c
index 043226a44..36d96a035 100644
--- a/sm/certreqgen.c
+++ b/sm/certreqgen.c
@@ -294,11 +294,11 @@ read_parameters (ctrl_t ctrl, estream_t fp, ksba_writer_t writer)
       keyword = p;
       if (*keyword == '%')
         {
-          for (; *p && !spacep (p); p++)
+          for (; *p && !ascii_isspace (*p); p++)
             ;
           if (*p)
             *p++ = 0;
-          for (; spacep (p); p++)
+          for (; ascii_isspace (*p); p++)
             ;
           value = p;
           trim_trailing_spaces (value);