Index: kitcreator
==================================================================
--- kitcreator
+++ kitcreator
@@ -9,11 +9,11 @@
 fi
 if [ "$1" = "distclean" ]; then
 	mode="distclean"
 fi
 
-for pkg in tcl tk itcl mk4tcl tclvfs; do
+for pkg in tcl tk itcl mk4tcl tclvfs memchan kitsh; do
 	if [ "${mode}" = "distclean" ]; then
 		rm -rf "${pkg}/src"
 	fi
 
 	if [ "${mode}" = "clean" -o "${mode}" = "distclean" ]; then

Index: kitsh/build.sh
==================================================================
--- kitsh/build.sh
+++ kitsh/build.sh
@@ -42,15 +42,21 @@
 
 	## Install "boot.tcl"
 	cp 'boot.tcl' 'starpack.vfs/'
 
 	# Intall VFS onto kit
-	## Copy installed data for packages
-	mkdir "installed-pkgs"
-	cp -r "${OTHERPKGSDIR}"/*/inst/* 'installed-pkgs/'
+	if echo 'exit 0' | tclkit >/dev/null 2>/dev/null; then
+		## Install using existing Tclkit
+		tclkit installvfs.tcl kit starpack.vfs
+	else
+		## Bootstrap
+		### Copy installed data for packages
+		mkdir "installed-pkgs"
+		cp -r "${OTHERPKGSDIR}"/*/inst/* 'installed-pkgs/'
 
-	## Call installer
-	${TCLCONFIGDIR}/tclsh installvfs.tcl kit starpack.vfs
+		### Call installer
+		${TCLCONFIGDIR}/tclsh installvfs.tcl kit starpack.vfs
+	fi
 
 ) || exit 1
 
 exit 0