diff --git a/ChangeLog b/ChangeLog
index 79fd79556..436c0980b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/emu/main.c (main): Call hostfs_init only after init_all.
+
 2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/commands/menuentry.c (append_menu_entry): Don't rely on
diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
index 23b8516f1..c575beb4b 100644
--- a/grub-core/kern/emu/main.c
+++ b/grub-core/kern/emu/main.c
@@ -190,13 +190,14 @@ main (int argc, char *argv[])
   grub_emu_init ();
   grub_console_init ();
   grub_host_init ();
-  grub_hostfs_init ();
 
   /* XXX: This is a bit unportable.  */
   grub_util_biosdisk_init (dev_map);
 
   grub_init_all ();
 
+  grub_hostfs_init ();
+
   grub_emu_post_init ();
 
   /* Make sure that there is a root device.  */