diff --git a/ChangeLog b/ChangeLog
index 516282d02..586cc1dc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-10  Alexandre Boeglin  <alex@boeglin.org>
+
+	* normal/arg.c (grub_arg_parse): If one of the args is "--", call add_arg()
+	on remaining N args, instead of "--" arg N times.
+
 2008-02-09  Vesa Jaaskelainen  <chaac@nic.fi>
 
 	* font/manager.c (unknown_glyph): Added variable for unknown glyph.
diff --git a/normal/arg.c b/normal/arg.c
index ab3613d7f..3aa6a0331 100644
--- a/normal/arg.c
+++ b/normal/arg.c
@@ -313,7 +313,7 @@ grub_arg_parse (grub_command_t cmd, int argc, char **argv,
 	  if (grub_strlen (arg) == 2)
 	    {
 	      for (curarg++; curarg < argc; curarg++)
-		if (add_arg (arg) != 0)
+		if (add_arg (argv[curarg]) != 0)
 		  goto fail;
 	      break;
 	    }