diff --git a/ChangeLog b/ChangeLog
index d90de0e6f..5989ecb13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-03  Robert Millan  <rmh@aybabtu.com>
+
+	* kern/i386/pc/init.c (make_install_device): Check for `grub_prefix'
+	instead of `grub_install_dos_part' to determine whether a drive needs
+	to be prepended to prefix (`grub_install_dos_part' is not reliable,
+	because it can be overriden when loading GRUB via Multiboot).
+
 2008-08-02  Robert Millan  <rmh@aybabtu.com>
 
 	* util/i386/pc/grub-install.in: Remove trailing slash from prefix.
diff --git a/kern/i386/pc/init.c b/kern/i386/pc/init.c
index 6386686bd..0e973eaf4 100644
--- a/kern/i386/pc/init.c
+++ b/kern/i386/pc/init.c
@@ -64,7 +64,7 @@ make_install_device (void)
   /* XXX: This should be enough.  */
   char dev[100];
 
-  if (grub_install_dos_part != -2)
+  if (grub_prefix[0] != '(')
     {
       /* If the root drive is not set explicitly, assume that it is identical
          to the boot drive.  */