diff --git a/ChangeLog b/ChangeLog
index cbe7f0cf4..ddfe4af23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-01  Pavel Roskin  <proski@gnu.org>
+
+	* normal/arg.c (grub_arg_show_help): Fix spacing of the long
+	options to align them with the short options, e.g. "echo -e".
+
 2008-03-31  Bean  <bean123ch@gmail.com>
 
 	* video/reader/png.c (grub_png_data): New member is_16bit and
diff --git a/normal/arg.c b/normal/arg.c
index 3aa6a0331..bf5522928 100644
--- a/normal/arg.c
+++ b/normal/arg.c
@@ -147,7 +147,7 @@ grub_arg_show_help (grub_command_t cmd)
 	  if (opt->longarg)
 	    {
 	      grub_printf ("--%s", opt->longarg);
-	      spacing -= grub_strlen (opt->longarg);
+	      spacing -= grub_strlen (opt->longarg) + 2;
 	      
 	      if (opt->arg)
 		{