diff --git a/ChangeLog b/ChangeLog
index 1952e6d42..dc9b160ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-23  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* include/grub/parser.h (grub_parser_register): Document need
+	of `name' parameter.
+	* normal/main.c (grub_normal_read_line): Simplify prompt string.
+	* script/sh/main.c (grub_sh_parser, GRUB_MOD_INIT(sh)): Rename
+	"sh" to "grub".
+
 2009-11-23  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* Makefile.in ($(srcdir)/po/$(PACKAGE).pot): Pass --keyword=N_ to
diff --git a/include/grub/parser.h b/include/grub/parser.h
index 4ee0e8389..41f768bba 100644
--- a/include/grub/parser.h
+++ b/include/grub/parser.h
@@ -88,6 +88,7 @@ grub_err_t EXPORT_FUNC(grub_parser_execute) (char *source);
 
 static inline void
 grub_parser_register (const char *name __attribute__ ((unused)),
+		      /* `name' is ignored here, but used by genhandlerlist.sh.  */
 		      grub_parser_t parser)
 {
   grub_handler_register (&grub_parser_class, GRUB_AS_HANDLER (parser));
diff --git a/normal/main.c b/normal/main.c
index 748eef805..2f19542e8 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -523,9 +523,9 @@ static grub_err_t
 grub_normal_read_line (char **line, int cont)
 {
   grub_parser_t parser = grub_parser_get_current ();
-  char prompt[8 + grub_strlen (parser->name)];
+  char prompt[sizeof("> ") - 1 + grub_strlen (parser->name)];
 
-  grub_sprintf (prompt, "%s:%s> ", parser->name, (cont) ? "" : "grub");
+  grub_sprintf (prompt, "%s> ", parser->name);
 
   while (1)
     {
diff --git a/script/sh/main.c b/script/sh/main.c
index 4eefafa18..b5159dc7d 100644
--- a/script/sh/main.c
+++ b/script/sh/main.c
@@ -42,13 +42,13 @@ grub_normal_parse_line (char *line, grub_reader_getline_t getline)
 
 static struct grub_parser grub_sh_parser =
   {
-    .name = "sh",
+    .name = "grub",
     .parse_line = grub_normal_parse_line
   };
 
 GRUB_MOD_INIT(sh)
 {
-  grub_parser_register ("sh", &grub_sh_parser);
+  grub_parser_register ("grub", &grub_sh_parser);
 }
 
 GRUB_MOD_FINI(sh)