diff --git a/ChangeLog b/ChangeLog
index 907a489de..f300c84ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Add
+	explicit root argument to set to prevent UUID to be interpreted as
+	argument to set.
+
 2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/sparc64/ieee1275/crt0.S: Align stack.
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 9a77d1bdf..41359975e 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -119,7 +119,7 @@ prepare_grub_to_access_device ()
   # 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 --no-floppy --fs-uuid --set ${fs_uuid}"
+    echo "search --no-floppy --fs-uuid --set=root ${fs_uuid}"
   fi
 }