diff --git a/ChangeLog b/ChangeLog
index 91049acdd..4e03814fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/lib/arg.c (grub_arg_parse): Fix treating of all commands as
+	if they were BSD-style.
+
 2010-09-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/boot/i386/pc/lnxboot.S: Replace
diff --git a/grub-core/lib/arg.c b/grub-core/lib/arg.c
index dabf4e8ce..1c765f12a 100644
--- a/grub-core/lib/arg.c
+++ b/grub-core/lib/arg.c
@@ -260,7 +260,7 @@ grub_arg_parse (grub_extcmd_t cmd, int argc, char **argv,
       char *option = 0;
 
       /* No option is used.  */
-      if ((num && GRUB_COMMAND_OPTIONS_AT_START)
+      if ((num && (cmd->cmd->flags & GRUB_COMMAND_OPTIONS_AT_START))
 	  || arg[0] != '-' || grub_strlen (arg) == 1)
 	{
 	  if (add_arg (arg) != 0)