diff --git a/ChangeLog b/ChangeLog
index 940056b79..85564a969 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-02-27  Yoshinori K. Okuji  <okuji@enbug.org>
+
+	* normal/arg.c (grub_arg_show_help): Do not show the bug report
+	address.
+
+	* commands/help.c (grub_cmd_help): Do not print newlines after
+	the last command in print_command_help.
+
 2005-02-27  Yoshinori K. Okuji  <okuji@enbug.org>
 
 	* commands/default.h: New file.
diff --git a/commands/help.c b/commands/help.c
index 5f36e279e..b05787586 100644
--- a/commands/help.c
+++ b/commands/help.c
@@ -61,10 +61,12 @@ grub_cmd_help (struct grub_arg_list *state __attribute__ ((unused)), int argc,
 
   int print_command_help (grub_command_t cmd)
     {
-      if (!grub_strncmp (cmd->name, currarg, grub_strlen (currarg)))
+      if (! grub_strncmp (cmd->name, currarg, grub_strlen (currarg)))
 	{
+	  if (cnt++ > 0)
+	    grub_printf ("\n\n");
+	  
 	  grub_arg_show_help (cmd);
-	  grub_printf ("\n\n");
 	}
       return 0;
     }
diff --git a/normal/arg.c b/normal/arg.c
index 60b25f27a..b834d3116 100644
--- a/normal/arg.c
+++ b/normal/arg.c
@@ -130,7 +130,9 @@ grub_arg_show_help (grub_command_t cmd)
   if (cmd->options)
     showargs (cmd->options);
   showargs (help_options);
+#if 0
   grub_printf ("\nReport bugs to <%s>.\n", PACKAGE_BUGREPORT);
+#endif
 }