diff --git a/scripts/distro-builder b/scripts/distro-builder
index e26f4983e..6db54602d 100755
--- a/scripts/distro-builder
+++ b/scripts/distro-builder
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # Plugbox Linux Distribution Image Builder
-# Version 0.1.3
+# Version 0.2.0
 #
 # Licensed under the GPLv2.
 #
@@ -13,7 +13,7 @@
 # ==== Variables to set ====
 INSTALLEDPKGS="base kernel26-withlinux openssh openssl heimdal"
 RELEASEVER=1.1
-MAKETARGZ=0
+MAKETARGZ=1
 MAKEUBIIMG=1
 # ==== The Process ====
 mkdir -p $1
@@ -60,7 +60,9 @@ EOF
      mkfs.ubifs -x zlib -m 2048  -e 129024 -c 4096 -r $1 rootfs.ubifs.img
      ubinize -o rootfs.ubi.img -m 2048 -p 128KiB -s 512 ./ubi.cfg
      rm -f ubi.cfg rootfs.ubifs.img
-     echo  -e "\033[1mAll done!\033[0m"
 else
-     echo  -e "\033[1mAll done!\033[0m"
+     echo  -e "\033[1mNot creating an UBI image...\033[0m"
 fi
+
+echo -e "\033[1mCleaning up...\033[0m"
+rm -rf $1