diff --git a/ChangeLog b/ChangeLog
index 653436fbe..efef229bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-17  Robert Millan  <rmh@aybabtu.com>
+
+	* util/update-grub_lib.in (prepare_grub_to_access_device): Use
+	/boot/grub for the check in last commit, not /boot (they could be
+	different partitions).
+
 2008-06-16  Robert Millan  <rmh@aybabtu.com>
 
 	* util/update-grub_lib.in (prepare_grub_to_access_device): If we were
diff --git a/util/update-grub_lib.in b/util/update-grub_lib.in
index ac84b0bd3..76b7460a1 100644
--- a/util/update-grub_lib.in
+++ b/util/update-grub_lib.in
@@ -114,9 +114,9 @@ prepare_grub_to_access_device ()
 {
   device=$1
 
-  # If our target is the same partition that provides /boot, our $root
+  # If our target is the same partition that provides /boot/grub, our $root
   # is already set to what we want, so no need to bother with UUIDs.
-  if [ "x${device}" = "x${GRUB_DEVICE_BOOT}" ] ; then
+  if [ "x${device}" = "x`${grub_probe} --target=device /boot/grub`" ] ; then
     return
   fi