diff --git a/ChangeLog b/ChangeLog
index 7276157a3..e5ddeda69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-01  Robert Millan  <rmh@aybabtu.com>
+
+	* util/update-grub_lib.in (prepare_grub_to_access_device): Generate
+	code that is backward compatible with pre-uuid search command.
+
 2008-05-31  Robert Millan  <rmh@aybabtu.com>
 
 	* disk/i386/pc/biosdisk.c (grub_biosdisk_iterate): Iterate through
diff --git a/util/update-grub_lib.in b/util/update-grub_lib.in
index 75c5bbf5d..969ec3011 100644
--- a/util/update-grub_lib.in
+++ b/util/update-grub_lib.in
@@ -116,10 +116,9 @@ prepare_grub_to_access_device ()
 
   # If there's a filesystem UUID that GRUB is capable of identifiing, use it;
   # otherwise set root as per value in device.map.
+  echo "set root=`${grub_probe} --device ${device} --target=drive`"
   if fs_uuid="`${grub_probe} --device ${device} --target=fs_uuid 2> /dev/null`" ; then
     echo "search --fs-uuid --set ${fs_uuid}"
-  else
-    echo "set root=`${grub_probe} --device ${device} --target=drive`"
   fi
 
   # Abstraction modules aren't auto-loaded.