Index: kitsh/buildsrc/kitsh-0.0/Makefile.kitdll.in
==================================================================
--- kitsh/buildsrc/kitsh-0.0/Makefile.kitdll.in
+++ kitsh/buildsrc/kitsh-0.0/Makefile.kitdll.in
@@ -13,20 +13,14 @@
 TCLSH_NATIVE = tclsh
 
 # Default target
 all: libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@
 
-# Build targets
-## VFS Build
-vfs_kitdll_data_tcl.o: vfs_kitdll_data_tcl.c
-vfs_kitdll_data_tcl.c: dir2c.tcl starpack.vfs vfs_kitdll_data.c
-	"$(TCLSH_NATIVE)" dir2c.tcl tcl starpack.vfs > vfs_kitdll_data_tcl.c
+-include Makefile.common
 
 ## Tclkit Build
 kitInit.o: kitInit.c vfs_kitdll.tcl.h
-vfs_kitdll.tcl.h: vfs_kitdll.tcl
-	"$(TCLSH_NATIVE)" ./stringify.tcl vfs_kitdll.tcl > vfs_kitdll.tcl.h
 
 ## Extensions
 rechan.o: rechan.c
 pwb.o: pwb.c
 zlib.o: zlib.c
@@ -55,11 +49,11 @@
 	rm -f wish.o wish wish.exe
 
 distclean: clean
 	rm -f config.status config.log
 	rm -f *~
-	rm -f Makefile
+	rm -f Makefile Makefile.in Makefile.common
 	rm -rf starpack.vfs
 
 mrproper: distclean
 
 .PHONY: all clean distclean

Index: kitsh/buildsrc/kitsh-0.0/Makefile.tclkit.in
==================================================================
--- kitsh/buildsrc/kitsh-0.0/Makefile.tclkit.in
+++ kitsh/buildsrc/kitsh-0.0/Makefile.tclkit.in
@@ -7,29 +7,31 @@
 ARCHS = @ARCHS@
 OBJS = kitInit.o main.o pwb.o rechan.o zlib.o winMain.o
 EXTRA_OBJS = @EXTRA_OBJS@
 
 all: kit
+
+-include Makefile.common
 
 kit.res.o: kit.rc kit.ico
 	$(RC) -o kit.res.o $(CPPFLAGS) kit.rc
 
 kit: $(OBJS) $(EXTRA_OBJS) $(ARCHS)
 	$(CC) $(CPPFLAGS) $(CFLAGS) -o kit $(OBJS) $(EXTRA_OBJS) $(ARCHS) $(LDFLAGS) $(LIBS)
 
 boot.tcl.h: boot.tcl
-	./stringify.tcl boot.tcl > boot.tcl.h
+	"$(TCLSH_NATIVE)" ./stringify.tcl boot.tcl > boot.tcl.h
 
 zipvfs.tcl.h: zipvfs.tcl
-	./stringify.tcl zipvfs.tcl > zipvfs.tcl.h
+	"$(TCLSH_NATIVE)" ./stringify.tcl zipvfs.tcl > zipvfs.tcl.h
 
 clean:
 	rm -f kit $(OBJS) kit.res.o
 
 distclean: clean
-	rm -f config.h Makefile Makefile.in config.log config.status
+	rm -f config.h Makefile Makefile.in Makefile.common config.log config.status
 	rm -rf autom4te.cache
 
 mrproper: distclean
 	rm -f configure config.h boot.tcl.h zipvfs.tcl.h
 
 .PHONY: all clean distclean

Index: kitsh/buildsrc/kitsh-0.0/boot.tcl
==================================================================
--- kitsh/buildsrc/kitsh-0.0/boot.tcl
+++ kitsh/buildsrc/kitsh-0.0/boot.tcl
@@ -72,10 +72,13 @@
 
 				seek $::tclKitStorage_fd 0
 				set vfsHandler [list ::vfs::zip::handler $::tclKitStorage_fd]
 				unset ::tclKitStorage_fd
 			}
+			"cvfs" {
+				set vfsHandler [list ::vfs::kitdll::vfshandler tcl]
+			}
 		}
 
 		# mount the executable, i.e. make all runtime files available
 		vfs::filesystem mount $noe $vfsHandler
 

Index: kitsh/buildsrc/kitsh-0.0/configure.ac
==================================================================
--- kitsh/buildsrc/kitsh-0.0/configure.ac
+++ kitsh/buildsrc/kitsh-0.0/configure.ac
@@ -167,6 +167,6 @@
 dnl Put correct Makefile template in place
 rm -f Makefile.in
 cp Makefile.${TARGET}.in Makefile.in
 
 dnl Produce output
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile Makefile.common)