diff --git a/ChangeLog b/ChangeLog
index f2acda5e6..20499d719 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-2012-02-18 Vladimir Serbinenko  <phcoder@gmail.com>
+2012-02-19  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* util/grub-mkconfig.in (GRUB_CMDLINE_GNUMACH): Export variable.
+	* util/grub.d/10_hurd.in: Include GRUB_CMDLINE_GNUMACH in gnumach
+	command line.
+	* docs/grub.texi (Simple configuration): Document
+	GRUB_CMDLINE_GNUMACH.
+
+2012-02-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* conf/Makefile.common (platform_SCRIPTS): New variable.
 	(platform_PROGRAMS): Likewise.
@@ -7,14 +15,14 @@
 	* grub-core/Makefile.core.def (gdb_grub): Mark for install.
 	(gmodule.pl): Likewise.
 
-2012-02-18 Vladimir Serbinenko  <phcoder@gmail.com>
+2012-02-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Replace grub_checkkey with grub_getkey_noblock.
 
 	* grub-core/kern/term.c (grub_checkkey): Replaced with ...
 	(grub_getkey_noblock): ... this. All users updated.
 
-2012-02-18 Vladimir Serbinenko  <phcoder@gmail.com>
+2012-02-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/emu/console.c: Move to ...
 	* grub-core/term/emu/console.c: ...here.
diff --git a/docs/grub.texi b/docs/grub.texi
index 2c737593d..c49be91cc 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1202,6 +1202,9 @@ only to the default menu entry, after those listed in
 As @samp{GRUB_CMDLINE_LINUX} and @samp{GRUB_CMDLINE_LINUX_DEFAULT}, but for
 NetBSD.
 
+@item GRUB_CMDLINE_GNUMACH
+As @samp{GRUB_CMDLINE_LINUX}, but for GNU Mach.
+
 @item GRUB_CMDLINE_XEN
 @itemx GRUB_CMDLINE_XEN_DEFAULT
 The values of these options are appended to the values of
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index b5144e3a4..9c405053f 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -231,6 +231,7 @@ export GRUB_DEFAULT \
   GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT \
   GRUB_CMDLINE_NETBSD \
   GRUB_CMDLINE_NETBSD_DEFAULT \
+  GRUB_CMDLINE_GNUMACH \
   GRUB_TERMINAL_INPUT \
   GRUB_TERMINAL_OUTPUT \
   GRUB_SERIAL_COMMAND \
diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
index 23099f225..6a0d22b47 100644
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -87,7 +87,7 @@ EOF
   message="$(gettext_printf "Loading GNU Mach ...")"
   cat << EOF
 	echo		'$message'
-	multiboot	${kernel} root=device:${GRUB_DEVICE#/dev/}
+	multiboot	${kernel} root=device:${GRUB_DEVICE#/dev/} ${GRUB_CMDLINE_GNUMACH}
 EOF
   save_default_entry | sed -e "s/^/\t/"
   prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
@@ -111,7 +111,7 @@ EOF
   message="$(gettext_printf "Loading GNU Mach ...")"
   cat << EOF
 	echo		'$message'
-	multiboot	${kernel} root=device:${GRUB_DEVICE#/dev/} -s
+	multiboot	${kernel} root=device:${GRUB_DEVICE#/dev/} -s ${GRUB_CMDLINE_GNUMACH}
 EOF
   prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
   message="$(gettext_printf "Loading the Hurd ...")"