diff --git a/ChangeLog b/ChangeLog
index 123601adb..53e0f8cf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-01  Robert Millan  <rmh@aybabtu.com>
+
+	* util/grub-emu.c: Move initialization functions
+	grub_util_biosdisk_init() and grub_init_all() before
+	grub_util_biosdisk_get_grub_dev(), which relies on them.
+
 2007-04-19  Robert Millan  <rmh@aybabtu.com>
 
 	* util/powerpc/ieee1275/grub-install.in: Initialize ${bindir}, since
diff --git a/util/grub-emu.c b/util/grub-emu.c
index da8584d8b..58d763579 100644
--- a/util/grub-emu.c
+++ b/util/grub-emu.c
@@ -182,6 +182,11 @@ main (int argc, char *argv[])
       sleep (1);
     }
   
+  /* XXX: This is a bit unportable.  */
+  grub_util_biosdisk_init (args.dev_map);
+
+  grub_init_all ();
+
   /* Make sure that there is a root device.  */
   if (! args.root_dev)
     {
@@ -199,11 +204,6 @@ main (int argc, char *argv[])
   sprintf (prefix, "%s%s", args.root_dev, dir);
   free (dir);
   
-  /* XXX: This is a bit unportable.  */
-  grub_util_biosdisk_init (args.dev_map);
-
-  grub_init_all ();
-
   /* Start GRUB!  */
   if (setjmp (main_env) == 0)
     grub_main ();