diff --git a/ChangeLog b/ChangeLog
index 38aaaa5469..74b1d3632f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,7 +73,7 @@ Security
 
 Features
    * Add support for reading DH parameters with privateValueLength included
-     (contributed by Daniel Khan Gillmor).
+     (contributed by Daniel Kahn Gillmor).
    * Add support for bit strings in X.509 names (request by Fredrik Axelsson).
    * Add support for id-at-uniqueIdentifier in X.509 names.
    * Add support for overriding snprintf() (except on Windows) and exit() in
diff --git a/tests/scripts/generate_code.pl b/tests/scripts/generate_code.pl
index dcc4e11c83..1c7a281d7a 100755
--- a/tests/scripts/generate_code.pl
+++ b/tests/scripts/generate_code.pl
@@ -139,7 +139,7 @@ while($test_cases =~ /\/\* BEGIN_CASE *([\w:]*) \*\/\n(.*?)\n\/\* END_CASE \*\//
             $param_defs .= "    char *param$i = params[$i];\n";
             $param_checks .= "    if( verify_string( &param$i ) != 0 ) return( 2 );\n";
             push @dispatch_params, "param$i";
-            $mapping_regex .= ":[^:]+";
+            $mapping_regex .= ":[^:\n]+";
         }
         else
         {