diff --git a/kern/parser.c b/kern/parser.c
index e931853..feaee09 100644
--- a/kern/parser.c
+++ b/kern/parser.c
@@ -71,7 +71,10 @@ grub_parser_cmdline_state (grub_parser_state_t state, char c, char *result)
   for (transition = state_transitions; transition->from_state; transition++)
     {
       /* An exact match was found, use it.  */
-      if (transition->from_state == state && transition->input == c)
+      if (transition->from_state == state && 
+	  (transition->input == c || 
+	   (transition->input == ' ' && ! grub_isalpha (c) 
+	    && ! grub_isdigit (c) && c != '_')))
 	{
 	  found = 1;
 	  break;