Index: kernel/genarch/src/multiboot/multiboot.c
===================================================================
--- kernel/genarch/src/multiboot/multiboot.c	(revision d776329b69ef4b29a8601fe5affe7faa8c58b51d)
+++ kernel/genarch/src/multiboot/multiboot.c	(revision fd384d6ced77609e6ad611854814f0fac2b27b41)
@@ -100,4 +100,25 @@
 }
 
+static void multiboot_cmdline(char *cmdline)
+{
+	/*
+	 * GRUB passes the command line in an escaped form.
+	 */
+	for (size_t i = 0, j = 0;
+	    cmdline[i] && j < CONFIG_BOOT_ARGUMENTS_BUFLEN;
+	    i++, j++) {
+		if (cmdline[i] == '\\') {
+			switch (cmdline[i + 1]) {
+			case '\\':
+			case '\'':
+			case '\"':
+				i++;
+				break;
+			}
+		}
+		bargs[j] = cmdline[i];
+	} 
+}
+
 static void multiboot_modules(uint32_t count, multiboot_module_t *mods)
 {
@@ -153,5 +174,9 @@
 	if (signature != MULTIBOOT_LOADER_MAGIC)
 		return;
-	
+
+	/* Copy command line. */
+	if ((info->flags & MULTIBOOT_INFO_FLAGS_CMDLINE) != 0)
+		multiboot_cmdline((char *) MULTIBOOT_PTR(info->cmd_line));
+
 	/* Copy modules information. */
 	if ((info->flags & MULTIBOOT_INFO_FLAGS_MODS) != 0)
