diff --git a/ChangeLog b/ChangeLog
index 2e8c0daa5..bc6b8fd18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* lib/arg.c (grub_arg_show_help): Add the necessary spacing.
+
 2010-08-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/emu/getroot.c (find_mount_point_from_dir): Compile only if
diff --git a/lib/arg.c b/lib/arg.c
index 400314d30..a9b8a520e 100644
--- a/lib/arg.c
+++ b/lib/arg.c
@@ -144,8 +144,10 @@ grub_arg_show_help (grub_extcmd_t cmd)
 		}
 	    }
 
-	  /* FIXME: add spacing back.  */
-	  grub_xputs (_(opt->doc));
+	  while (spacing--)
+	    grub_xputs (" ");
+
+	  grub_printf ("%s\n", _(opt->doc));
 
 	  switch (opt->shortarg)
 	    {