diff --git a/debian/changelog b/debian/changelog
index 8b59b1a..46c67f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+live-build (3.0.5-1kali7) kali; urgency=medium
+
+  * Call binary_efi after binary_hooks to include the files after they have
+    been customized by the binary hooks.
+
+ -- Raphaël Hertzog <hertzog@debian.org>  Mon, 21 Jul 2014 23:20:58 +0200
+
 live-build (3.0.5-1kali6) kali; urgency=medium
 
   * Use the xorriso syntax that doesn't create a GPT but does create
diff --git a/debian/patches/add-efi-support.patch b/debian/patches/add-efi-support.patch
index cd109b0..e2db9fd 100644
--- a/debian/patches/add-efi-support.patch
+++ b/debian/patches/add-efi-support.patch
@@ -9,15 +9,16 @@
 
 --- a/scripts/build/binary
 +++ b/scripts/build/binary
-@@ -71,6 +71,8 @@ lb binary_disk ${@}
- lb binary_loadlin ${@}
+@@ -72,6 +72,9 @@ lb binary_loadlin ${@}
  lb binary_win32-loader ${@}
  lb binary_includes ${@}
-+lb binary_efi ${@} # After includes because it copies files that can be
-+                   # overriden by binary_includes in efi.img
  lb binary_hooks ${@}
++lb binary_efi ${@} # After includes/hooks because it copies in efi.img
++		   # files that can be overriden by binary_includes and
++		   # modified by binary_hooks
  lb binary_checksums ${@}
  
+ if [ "${LB_BUILD_WITH_CHROOT}" != "true" ]
 --- a/scripts/build/binary_iso
 +++ b/scripts/build/binary_iso
 @@ -88,6 +88,23 @@ fi