diff --git a/ChangeLog b/ChangeLog
index fd2f8ae72..65a3c69b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-04  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Prepend
+	"part_" to partmap module names, in line with grub-install.
+	Reported by: Jindřich Makovička (Debian bug #584426).
+
 2010-06-04  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-mkimage.c: Make target-related error messages slightly
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 7ec8cb5be..14ea1842f 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -107,7 +107,7 @@ prepare_grub_to_access_device ()
 
   partmap="`${grub_probe} --device ${device} --target=partmap`"
   for module in ${partmap} ; do
-    echo "insmod ${module}"
+    echo "insmod part_${module}"
   done
 
   fs="`${grub_probe} --device ${device} --target=fs`"