Index: include/grub/i386/pc/kernel.h
===================================================================
--- include/grub/i386/pc/kernel.h	(revision 1686)
+++ include/grub/i386/pc/kernel.h	(working copy)
@@ -41,7 +41,7 @@
 #define GRUB_KERNEL_MACHINE_PREFIX		0x20
 
 /* End of the data section. */
-#define GRUB_KERNEL_MACHINE_DATA_END		0x50
+#define GRUB_KERNEL_MACHINE_DATA_END		0x60
 
 /* The size of the first region which won't be compressed.  */
 #define GRUB_KERNEL_MACHINE_RAW_SIZE		(GRUB_KERNEL_MACHINE_DATA_END + 0x450)
Index: util/i386/pc/grub-install.in
===================================================================
--- util/i386/pc/grub-install.in	(revision 1686)
+++ util/i386/pc/grub-install.in	(working copy)
@@ -232,13 +232,13 @@
 devabstraction_module=`$grub_probe --target=abstraction --device ${grub_device}`
 
 if [ "x${devabstraction_module}" = "x" ] ; then
-    prefix_drive=
+    prefix_drive=\(UUID=`$grub_probe --target=fs_uuid --device ${grub_device}`\)
 else
     prefix_drive=`$grub_probe --target=drive --device ${grub_device}`
 fi
 
 # The order in this list is critical.  Be careful when modifiing it.
-modules="$modules $fs_module $partmap_module biosdisk $devabstraction_module"
+modules="$modules $fs_module $partmap_module biosdisk $devabstraction_module fs_uuid"
 
 $grub_mkimage --output=${grubdir}/core.img \
     --prefix=${prefix_drive}`make_system_path_relative_to_its_root ${grubdir}`/ \