diff --git a/ChangeLog b/ChangeLog
index de71948be..49b3c58d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-21  Robert Millan  <rmh@aybabtu.com>
+
+	* util/grub.d/00_header.in: Move last prepare_grub_to_access_device()
+	call from here ...
+
+	* util/grub.d/10_hurd.in: ... to here ...
+	* util/grub.d/10_linux.in: ... and here.
+
 2008-06-19  Robert Millan  <rmh@aybabtu.com>
 
 	* kern/main.c (grub_main): Export `prefix' variable inmediately
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index cabe569c3..bf9507c88 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -62,6 +62,3 @@ EOF
     echo "terminal ${GRUB_TERMINAL}"
   ;;
 esac
-
-# Set the root device.
-prepare_grub_to_access_device ${GRUB_DEVICE_BOOT}
diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
index 99d57e53b..d437873d2 100644
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -63,6 +63,8 @@ if ${all_of_them} && test -e /lib/ld.so.1 ; then : ; else
   exit 1
 fi
 
+prepare_grub_to_access_device ${GRUB_DEVICE}
+
 cat << EOF
 menuentry "${OS}" {
 	multiboot ${kernel} root=device:${GRUB_DEVICE}
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 1ae1e1e51..6ee705ba0 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -97,6 +97,10 @@ list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do
         if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
       done`
 
+if [ "x$list" != "x" ] ; then
+  prepare_grub_to_access_device ${GRUB_DEVICE_BOOT}
+fi
+
 while [ "x$list" != "x" ] ; do
   linux=`find_latest $list`
   echo "Found linux image: $linux" >&2