Index: build/pre.sh
==================================================================
--- build/pre.sh
+++ build/pre.sh
@@ -19,8 +19,6 @@
 	make distclean
 ) || exit 1
 
 rm -rf tcl/patchscripts/
 
-rm -rf kitdll
-
 find . -name '.*.sw?' -type f | xargs rm -f

Index: kitcreator
==================================================================
--- kitcreator
+++ kitcreator
@@ -20,11 +20,11 @@
 
 	mode="distclean"
 fi
 
 # Define the list of all packages, for cleaning purposes
-KITCREATOR_ALLPKGS="kitsh tcl tclvfs zlib tk itcl mk4tcl thread"
+KITCREATOR_ALLPKGS="kitsh tcl tclvfs zlib tk itcl mk4tcl thread kitdll"
 for pkg in ${KITCREATOR_ALLPKGS}; do
 	rm -f "${pkg}/build.log"
 	rm -rf "${pkg}/out" "${pkg}/inst" "${pkg}/build"
 
 	if [ "${mode}" = "distclean" ]; then
@@ -33,10 +33,11 @@
 done
 
 # We're all done if we're in clean or distclean mode
 if [ "${mode}" = "clean" -o "${mode}" = "distclean" ]; then
 	rm -f tclkit-*
+	rm -f libtcl.*
 
 	exit 0
 fi
 
 # Add packages implied by the additional arguments
@@ -88,8 +89,9 @@
 
 if [ "${buildfailed}" != "0" ]; then
 	echo 'WARNING: Build is likely incomplete or failed.' >&2
 fi
 
+cp 'kitdll/build'/kitdll-*/libtcl.* "$(basename 'kitdll/build'/kitdll-*/libtcl.* | sed "s@\..*\$@-${TCLVERS}&@")" >/dev/null 2>/dev/null
 cp 'kitsh/build'/kitsh-*/kit "tclkit-${TCLVERS}"
 
 exit "${buildfailed}"

Index: kitdll/build.sh
==================================================================
--- kitdll/build.sh
+++ kitdll/build.sh
@@ -34,19 +34,11 @@
 		fi
 	done
 
 	# Cleanup, just incase the incoming directory was not pre-cleaned
 	${MAKE:-make} distclean >/dev/null 2>/dev/null
-
-	echo "Running: ./configure --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
-	./configure --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
-
-	echo "Running: ${MAKE:-make}"
-	${MAKE:-make} TCLSH_NATIVE="${TCLSH_NATIVE}" || exit 1
-
-	# Strip the KitDLL of debugging symbols, if possible
-	"${STRIP:-strip}" -g libtcl.* >/dev/null 2>/dev/null
+	rm -rf "starpack.vfs"
 
 	# Create VFS directory
 	mkdir "starpack.vfs"
 	mkdir "starpack.vfs/lib"
 
@@ -59,9 +51,19 @@
 	mv 'starpack.vfs/lib'/vfs* 'starpack.vfs/lib/vfs'
 
 	## Install "boot.tcl"
 	cp 'boot.tcl' 'starpack.vfs/'
 
+	# Build KitDLL
+	echo "Running: ./configure --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
+	./configure --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
+
+	echo "Running: ${MAKE:-make}"
+	${MAKE:-make} TCLSH_NATIVE="${TCLSH_NATIVE}" || exit 1
+
+	# Strip the KitDLL of debugging symbols, if possible
+	"${STRIP:-strip}" -g libtcl.* >/dev/null 2>/dev/null
+
 	exit 0
 ) || exit 1
 
 exit 0