diff --git a/ChangeLog b/ChangeLog
index 5a3f80e05..24dbdbf31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-02  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* util/grub.d/10_hurd.in: Call prepare_grub_to_access_device
+	${GRUB_DEVICE_BOOT} before loading /boot kernel.
+
 2009-11-01  Robert Millan  <rmh.grub@aybabtu.com>
 
 	Based on patch from BVK Chaitanya  <bvk.groups@gmail.com>
diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
index b52f37498..fdfb7acb7 100644
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -71,9 +71,12 @@ fi
 cat << EOF
 menuentry "${OS}" {
 EOF
-prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
+prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
 cat << EOF
 	multiboot ${kernel} root=device:${GRUB_DEVICE}
+EOF
+prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
+cat << EOF
 	module /hurd/${hurd_fs}.static ${hurd_fs} --readonly \\
 			--multiboot-command-line='\${kernel-command-line}' \\
 			--host-priv-port='\${host-port}' \\