diff --git a/ChangeLog b/ChangeLog
index 4688c5014..875edec38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/lib/arg.c (grub_arg_show_help): Correctly handle
+	parameters overflow.
+
 2010-09-20  Colin Watson  <cjwatson@ubuntu.com>
 
 	* .bzrignore: Add grub-core/gnulib/sys, widthspec.bin, and
diff --git a/grub-core/lib/arg.c b/grub-core/lib/arg.c
index f487de7ad..dabf4e8ce 100644
--- a/grub-core/lib/arg.c
+++ b/grub-core/lib/arg.c
@@ -144,6 +144,9 @@ grub_arg_show_help (grub_extcmd_t cmd)
 		}
 	    }
 
+	  if (spacing < 0)
+	    spacing = 3;
+
 	  while (spacing--)
 	    grub_xputs (" ");