diff --git a/ChangeLog b/ChangeLog
index 140111388..64c88d474 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2012-06-17  Vladimir Serbinenko  <phcoder@gmail.com>
+2012-06-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Generate
+	UUID search command even if hints probing failed.
+
+2012-06-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* po/POTFILES.in: Regenerated.
 
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 606cb04aa..2b887b195 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -153,7 +153,7 @@ prepare_grub_to_access_device ()
     echo "set root='$fs_hint'"
   fi
   if fs_uuid="`"${grub_probe}" --device "${device}" --target=fs_uuid 2> /dev/null`" ; then
-    hints="`"${grub_probe}" --device "${device}" --target=hints_string 2> /dev/null`"
+    hints="`"${grub_probe}" --device "${device}" --target=hints_string 2> /dev/null`" || hints=
     echo "if [ x\$feature_platform_search_hint = xy ]; then"
     echo "  search --no-floppy --fs-uuid --set=root ${hints} ${fs_uuid}"
     echo "else"