diff --git a/ChangeLog b/ChangeLog
index 49b3c58d8..7f288a1bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-21  Javier Martín  <lordhabbit@gmail.com>
+
+	* util/i386/pc/grub-setup.c (setup): Remove literal "core.img" in a
+	call to resolve the core image location that effectively appended the
+	name twice.
+
 2008-06-21  Robert Millan  <rmh@aybabtu.com>
 
 	* util/grub.d/00_header.in: Move last prepare_grub_to_access_device()
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 2a3ebd15f..043484edb 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -368,7 +368,7 @@ setup (const char *dir,
   
   /* Make sure that GRUB reads the identical image as the OS.  */
   tmp_img = xmalloc (core_size);
-  core_path = grub_util_get_path (DEFAULT_DIRECTORY "core.img", core_file);
+  core_path = grub_util_get_path (DEFAULT_DIRECTORY, core_file);
   
   /* It is a Good Thing to sync two times.  */
   sync ();