diff --git a/ChangeLog b/ChangeLog
index 95a0ae2fb..c2aa58c02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-25  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	Fix grub-emu build.
+
+	* grub-core/kern/emu/main.c: Remove #include <getopt.h>.
+	* grub-core/kern/emu/full.c: Split grub_mdraid_{init,fini} into
+	mdraid09 and mdraid1x.
+
 2010-09-24  Colin Watson  <cjwatson@ubuntu.com>
 
 	Re-enable grub-extras.
diff --git a/grub-core/kern/emu/full.c b/grub-core/kern/emu/full.c
index a5801db2f..422ca6ec6 100644
--- a/grub-core/kern/emu/full.c
+++ b/grub-core/kern/emu/full.c
@@ -61,9 +61,11 @@ void
 grub_emu_post_init (void)
 {
   grub_lvm_fini ();
-  grub_mdraid_fini ();
+  grub_mdraid09_fini ();
+  grub_mdraid1x_fini ();
   grub_raid_fini ();
   grub_raid_init ();
-  grub_mdraid_init ();
+  grub_mdraid09_fini ();
+  grub_mdraid1x_fini ();
   grub_lvm_init ();
 }
diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
index c575beb4b..0a7645992 100644
--- a/grub-core/kern/emu/main.c
+++ b/grub-core/kern/emu/main.c
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 #include <setjmp.h>
 #include <sys/stat.h>
-#include <getopt.h>
 #include <string.h>
 #include <signal.h>
 #include <sys/types.h>