diff --git a/ChangeLog b/ChangeLog
index 7785ac9f7..794fdf719 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkrescue.in (process_input_dir): Include efiemu??.o.
+
 2011-05-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/lib/legacy_parse.c (grub_legacy_parse): Correctly handle
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 455534009..f7f751708 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -160,7 +160,7 @@ process_input_dir ()
     input_dir="$1"
     platform="$2"
     mkdir -p ${iso9660_dir}/boot/grub/${platform}
-    for file in ${input_dir}/*.mod; do
+    for file in "${input_dir}/"*.mod "${input_dir}/"efiemu32.o "${input_dir}/"efiemu64.o; do
         if test -f "$file"; then
             cp -f "$file" ${iso9660_dir}/boot/grub/${platform}/
         fi