Index: loader/i386/multiboot.c
===================================================================
--- loader/i386/multiboot.c	(revision 2465)
+++ loader/i386/multiboot.c	(working copy)
@@ -201,6 +201,8 @@
   grub_ssize_t len, cmdline_length, boot_loader_name_length;
   grub_uint32_t mmap_length;
   int i;
+  int cmdline_argc;
+  char **cmdline_argv;
 
   grub_loader_unset ();
 
@@ -256,9 +258,12 @@
 
   mmap_length = grub_get_multiboot_mmap_len ();
 
+  cmdline_argv = argv + 1;
+  cmdline_argc = argc - 1;
+
   /* Figure out cmdline length.  */
-  for (i = 0, cmdline_length = 0; i < argc; i++)
-    cmdline_length += grub_strlen (argv[i]) + 1;
+  for (i = 0, cmdline_length = 0; i < cmdline_argc; i++)
+    cmdline_length += grub_strlen (cmdline_argv[i]) + 1;
 
   boot_loader_name_length = sizeof(PACKAGE_STRING);
 
@@ -351,9 +356,9 @@
   if (! cmdline)
     goto fail;
 
-  for (i = 0; i < argc; i++)
+  for (i = 0; i < cmdline_argc; i++)
     {
-      p = grub_stpcpy (p, argv[i]);
+      p = grub_stpcpy (p, cmdline_argv[i]);
       *(p++) = ' ';
     }