diff --git a/make.iso.preseed.sh b/make.iso.preseed.sh
index 71fc3dc..43a419c 100755
--- a/make.iso.preseed.sh
+++ b/make.iso.preseed.sh
@@ -125,10 +125,18 @@ chmod -w -- md5sum.txt
 cd - > /dev/null || exit 2
 # }}}
 # Generate new bootable iso {{{
-xorriso -as mkisofs -o "${DEBIAN_PRESEED_ISO_PATH}" \
+if [ -d "${TEMP_ISO_DIR}/isolinux" ] ; then
+	xorriso -as mkisofs -o "${DEBIAN_PRESEED_ISO_PATH}" \
 -quiet -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin \
 -c isolinux/boot.cat -b isolinux/isolinux.bin -no-emul-boot \
 -boot-load-size 4 -boot-info-table "${TEMP_ISO_DIR}"
+else
+	## For mini.iso creation
+	xorriso -as mkisofs -o "${DEBIAN_PRESEED_ISO_PATH}" \
+-quiet -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin \
+-c boot.cat -b isolinux.bin -no-emul-boot \
+-boot-load-size 4 -boot-info-table "${TEMP_ISO_DIR}"
+fi
 
 ## Then remove temp iso directory
 chmod u+w -R -- "${TEMP_ISO_DIR}"
@@ -136,6 +144,8 @@ rm -rf -- "${TEMP_ISO_DIR}"
 
 # }}}
 
+rmdir -- "${TEMP_DIR}"
+
 printf '%b\n' "The new ISO image is available : ${DEBIAN_PRESEED_ISO_PATH}"
 
 exit 0