diff --git a/ChangeLog b/ChangeLog
index 07dbb52fe..ebeb7ca93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-27  Carles Pina i Estany  <carles@pina.cat>
+
+	* normal/cmdline.c (grub_cmdline_get): Print a space after prompt.
+	* normal/main.c (grub_normal_read_line): Remove a space from the
+	default prompt.
+
 2009-12-27  Carles Pina i Estany  <carles@pina.cat>
 
 	* loader/i386/efi/linux.c (GRUB_MOD_INIT): Improve command summary.
diff --git a/normal/cmdline.c b/normal/cmdline.c
index 6d74e6e69..19b83951a 100644
--- a/normal/cmdline.c
+++ b/normal/cmdline.c
@@ -268,14 +268,14 @@ grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
       grub_refresh ();
     }
 
-  plen = grub_strlen (prompt_translated);
+  plen = grub_strlen (prompt_translated) + sizeof (" ") - 1;
   lpos = llen = 0;
   buf[0] = '\0';
 
   if ((grub_getxy () >> 8) != 0)
     grub_putchar ('\n');
 
-  grub_printf ("%s", prompt_translated);
+  grub_printf ("%s ", prompt_translated);
 
   xpos = plen;
   ystart = ypos = (grub_getxy () & 0xFF);
diff --git a/normal/main.c b/normal/main.c
index 17e21566d..23de7e238 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -546,9 +546,9 @@ static grub_err_t
 grub_normal_read_line (char **line, int cont)
 {
   grub_parser_t parser = grub_parser_get_current ();
-  char prompt[sizeof("> ") + grub_strlen (parser->name)];
+  char prompt[sizeof(">") + grub_strlen (parser->name)];
 
-  grub_sprintf (prompt, "%s> ", parser->name);
+  grub_sprintf (prompt, "%s>", parser->name);
 
   while (1)
     {