diff --git a/debian/changelog b/debian/changelog
index dc21cc19..9a7debea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.408.33) xenial; urgency=medium
+
+  * Zero fill space in UEFI partitions, too
+  * Set LB_ISO_PREPARER to livecd-rootfs to avoid unbound variable in default string
+
+ -- Robert C Jennings <robert.jennings@canonical.com>  Fri, 08 Jun 2018 09:12:03 -0700
+
 livecd-rootfs (2.408.32) xenial; urgency=medium
 
   * snaps: Fixes for snap pre-seeding (LP: #1775710)
diff --git a/live-build/auto/config b/live-build/auto/config
index ff0c4307..2e7c2e25 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -669,6 +669,7 @@ esac
 lb config noauto \
 	--mode ubuntu \
 	--distribution "$SUITE" \
+	--iso-preparer "livecd-rootfs" \
 	--bootstrap-keyring ubuntu-keyring \
 	--binary-images "$BINARY_IMAGES" \
 	--memtest "$MEMTEST" \
diff --git a/live-build/functions b/live-build/functions
index a4c0593a..cbe108f4 100644
--- a/live-build/functions
+++ b/live-build/functions
@@ -161,6 +161,9 @@ umount_disk_image() {
 
     local uefi_dev="/dev/mapper${loop_device///dev/}p15"
     if [ -e "$mountpoint/boot/efi" -a -b "$uefi_dev" ]; then
+        # zero fill free space in UEFI partition
+        cat < /dev/zero > "$mountpoint/boot/efi/bloat_file" 2> /dev/null || true
+        rm "$mountpoint/boot/efi/bloat_file"
         umount --detach-loop "$mountpoint/boot/efi"
     fi