diff --git a/ChangeLog.mkrelpath b/ChangeLog.mkrelpath
index 1b7b2b851..3cd0d8bd2 100644
--- a/ChangeLog.mkrelpath
+++ b/ChangeLog.mkrelpath
@@ -1,3 +1,8 @@
+2009-11-11  Felix Zielcke  <fzielcke@z-51.de>
+
+	* util/i386/pc/grub-setup.c (setup): Make core.img path relative
+	to its root.
+
 2009-11-04  Felix Zielcke  <fzielcke@z-51.de>
 
 	* util/grub-mkconfig_lib.in (bindir): New variable.
diff --git a/autogen.sh b/autogen.sh
old mode 100644
new mode 100755
diff --git a/gendistlist.sh b/gendistlist.sh
old mode 100644
new mode 100755
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index c536be0c4..0cc4fc5ed 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -88,7 +88,7 @@ setup (const char *dir,
        const char *boot_file, const char *core_file,
        const char *root, const char *dest, int must_embed, int force, int fs_probe)
 {
-  char *boot_path, *core_path, *core_path_dev;
+  char *boot_path, *core_path, *core_path_dev, *core_path_dev_full;
   char *boot_img, *core_img;
   size_t boot_size, core_size;
   grub_uint16_t core_sectors;
@@ -426,7 +426,9 @@ unable_to_embed:
 
   /* Make sure that GRUB reads the identical image as the OS.  */
   tmp_img = xmalloc (core_size);
-  core_path_dev = grub_util_get_path (dir, core_file);
+  core_path_dev_full = grub_util_get_path (dir, core_file);
+  core_path_dev = make_system_path_relative_to_its_root (core_path_dev_full);
+  free (core_path_dev_full);
 
   /* It is a Good Thing to sync two times.  */
   sync ();