diff --git a/ChangeLog b/ChangeLog
index e553828..429bb75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-01  Vladimir Serbinenko  <address@hidden>
+
+	* loader/i386/multiboot.c (grub_multiboot): Don't pass filename to
+	payload.
+	(grub_module): Likewise.
+
 2009-07-31  Vladimir Serbinenko  <address@hidden>
 
 	* partmap/pc.c (pc_partition_map_iterate): Check that boot flags are
diff --git a/loader/i386/multiboot.c b/loader/i386/multiboot.c
index 87ffcae..f25f77b 100644
--- a/loader/i386/multiboot.c
+++ b/loader/i386/multiboot.c
@@ -257,9 +257,12 @@ grub_multiboot (int argc, char *argv[])
   mmap_length = grub_get_multiboot_mmap_len ();
 
   /* Figure out cmdline length.  */
-  for (i = 0, cmdline_length = 0; i < argc; i++)
+  for (i = 1, cmdline_length = 0; i < argc; i++)
     cmdline_length += grub_strlen (argv[i]) + 1;
 
+  if (cmdline_length == 0)
+    cmdline_length = 1;
+
   boot_loader_name_length = sizeof(PACKAGE_STRING);
 
 #define cmdline_addr(x)		((void *) ((x) + code_size))
@@ -351,14 +354,16 @@ grub_multiboot (int argc, char *argv[])
   if (! cmdline)
     goto fail;
 
-  for (i = 0; i < argc; i++)
+  for (i = 1; i < argc; i++)
     {
       p = grub_stpcpy (p, argv[i]);
       *(p++) = ' ';
     }
 
   /* Remove the space after the last word.  */
-  *(--p) = '\0';
+  if (p != cmdline)
+    p--;
+  *p = 0;
 
   mbi->flags |= MULTIBOOT_INFO_CMDLINE;
   mbi->cmdline = (grub_uint32_t) cmdline_addr (grub_multiboot_payload_dest);
@@ -422,9 +427,12 @@ grub_module  (int argc, char *argv[])
       goto fail;
     }
 
-  for (i = 0; i < argc; i++)
+  for (i = 1; i < argc; i++)
     len += grub_strlen (argv[i]) + 1;
 
+  if (len == 0)
+    len = 1;
+
   cmdline = p = grub_malloc (len);
   if (! cmdline)
     goto fail;
@@ -436,7 +444,9 @@ grub_module  (int argc, char *argv[])
     }
 
   /* Remove the space after the last word.  */
-  *(--p) = '\0';
+  if (p != cmdline)
+    p--;
+  *p = '\0';
 
   if (mbi->flags & MULTIBOOT_INFO_MODS)
     {