diff --git a/ChangeLog b/ChangeLog
index 83ac0b37b..9729f71d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-01  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-mkrescue.in: Remove ${efi_dir} after building efi.img.
+
 2010-08-01  Colin Watson  <cjwatson@ubuntu.com>
 
 	* script/yylex.l (NAME): Remove [:digit:], redundant with [:alnum:].
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index e498acee7..b7d9eb4eb 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -296,6 +296,7 @@ if test -e "${efi64_dir}" || test -e "${efi32_dir}"; then
 
     mformat -C -f 2880 -L 16 -i "${iso9660_dir}"/efi.img ::
     mcopy -s -i "${iso9660_dir}"/efi.img ${efi_dir}/efi ::/
+    rm -rf ${efi_dir}
     grub_mkisofs_arguments="${grub_mkisofs_arguments} --efi-boot efi.img"
 fi