diff --git a/ChangeLog b/ChangeLog
index b2d543687..8ac9309a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-08  Felix Zielcke  <fzielcke@z-51.de>
+
+	* kern/rescue_parser.c (grub_rescue_parse_line): Only suggest to try
+	`help' if the command exists.
+
 2009-09-06  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* INSTALL: Require GCC 4.1.3 or later.
diff --git a/kern/rescue_parser.c b/kern/rescue_parser.c
index 79f32b8fd..1e0841e49 100644
--- a/kern/rescue_parser.c
+++ b/kern/rescue_parser.c
@@ -61,7 +61,8 @@ grub_rescue_parse_line (char *line, grub_reader_getline_t getline)
   else
     {
       grub_printf ("Unknown command `%s'\n", name);
-      grub_printf ("Try `help' for usage\n");
+      if (grub_command_find ("help"))
+	grub_printf ("Try `help' for usage\n");
     }
 
  quit: