diff --git a/debian/changelog b/debian/changelog
index eaf40597..a261ad11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.302) wily; urgency=medium
+
+  * Call Setup_cleanup in live-build/auto/build to set exit handler.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 25 May 2015 23:09:42 -0600
+
 livecd-rootfs (2.301) wily; urgency=low
 
   [ Michael Vogt ]
diff --git a/live-build/auto/build b/live-build/auto/build
index 539ac7c2..3c5d203f 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -10,6 +10,9 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
+# Setup cleanup function
+Setup_cleanup
+
 rm -f binary.success
 (
 	if [ -d config/gnupg ]; then