diff --git a/ChangeLog b/ChangeLog
index 7319a5e31..7ff96067b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-30  Pavel Roskin  <proski@gnu.org>
+
+	* util/i386/pc/grub-setup.c (setup): Use core_path_dev, not
+	core_path to calculate the blocklist.
+	Patch from Javier Martín <lordhabbit@gmail.com>
+
 2008-06-29  Robert Millan  <rmh@aybabtu.com>
 
 	* fs/xfs.c (GRUB_XFS_FSB_TO_BLOCK): New macro.  Maps filesystem
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 62c1bf15d..a5e3175b0 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -452,7 +452,7 @@ setup (const char *dir,
     }
   
   /* Now read the core image to determine where the sectors are.  */
-  file = grub_file_open (core_path);
+  file = grub_file_open (core_path_dev);
   if (! file)
     grub_util_error ("%s", grub_errmsg);