diff --git a/zlibs/bootstrap b/zlibs/bootstrap
index e9ab069..5f56f89 100644
--- a/zlibs/bootstrap
+++ b/zlibs/bootstrap
@@ -92,6 +92,7 @@ rm -f /thirdstage
 rm -f /etc/ssh/*_key
 rm -f /etc/ssh/*.pub
 rm -f /root/.bash_history
+rm -f /usr/bin/qemu-*
 ## our file for which we check the bootstrap is complete
 echo "1" > .done
 rm -f /cleanup
diff --git a/zlibs/helpers b/zlibs/helpers
index 6149bec..6b2d218 100644
--- a/zlibs/helpers
+++ b/zlibs/helpers
@@ -19,6 +19,23 @@
 
 ## helper functions that make your life easier
 
+build_image_dist() {
+	fn build_image_dist
+	req=(arch size parted_boot parted_root parted_type)
+	req+=(workdir strapdir image_name)
+	ckreq || return 1
+
+	notice "building complete dist image"
+	act "$image_name"
+
+	bootstrap_complete_base            || zerr
+	image_prepare_raw                  || zerr
+	image_partition_raw_${parted_type} || zerr
+	build_kernel_${arch}               || zerr
+	rsync_to_raw_image                 || zerr
+	image_pack_dist                    || zerr
+}
+
 devprocsys() {
 	fn devprocsys "$@"
 	local watdo="$1"
diff --git a/zlibs/imaging b/zlibs/imaging
index 302e477..3651a19 100644
--- a/zlibs/imaging
+++ b/zlibs/imaging
@@ -81,8 +81,8 @@ image_partition_raw_gpt() {
 	sudo mkfs.ext4 -L rootfs $rootpart
 }
 
-image_package_dist() {
-	fn image_package_dist
+image_pack_dist() {
+	fn image_pack_dist
 	req=(mappdevice loopdevice image_name strapdir workdir)
 	ckreq || return 1