@@ -135,10 +135,11 @@
 	"return -code $code $res\n"
 "}\n"
 #endif /* _WIN32_WCE && !TCLKIT_DLL */
 "proc tclKitInit {} {\n"
 	"rename tclKitInit {}\n"
+	"catch { load {} vfs }\n"
 #ifdef KIT_INCLUDES_ZLIB
 	"catch { load {} zlib }\n"
 #endif
 #ifdef KIT_INCLUDES_MK4TCL
 	"catch { load {} Mk4tcl }\n"
@@ -153,10 +154,12 @@
 		"catch {\n"
 			"set f [open $bootfile]\n"
 			"set s [read $f]\n"
 			"close $f\n"
 		"}\n"
+	"} else {\n"
+		"set ::TCLKIT_INITVFS 1\n"
 	"}\n"
 #ifdef KIT_STORAGE_MK4
 	"set ::tclKitStorage \"mk4\"\n"
 	"if {![info exists s]} {\n"
 		"mk::file open exe " TCLKIT_VFSSOURCE " -readonly\n"
@@ -171,11 +174,10 @@
 		"}\n"
 	"}\n"
 #endif /* KIT_STORAGE_MK4 */
 #ifdef KIT_STORAGE_ZIP
 	"set ::tclKitStorage \"zip\"\n"
-	"catch { load {} vfs }\n"
 	"if {![info exists s]} {\n"
 #  include "zipvfs.tcl.h"
 		"catch {\n"
 			"set ::tclKitStorage_fd [::zip::open " TCLKIT_VFSSOURCE "]\n"
 			"::zip::stat $::tclKitStorage_fd boot.tcl sb\n"
@@ -185,11 +187,10 @@
 	"}\n"
 #endif /* KIT_STORAGE_ZIP */
 #ifdef KIT_STORAGE_CVFS
 	"set ::tclKitStorage \"cvfs\"\n"
 	"load {} rechan\n"
-	"load {} vfs\n"
 	"load {} cvfs_data_tcl\n"
 #include "cvfs.tcl.h"
 	"if {![info exists s]} {\n"
 		"catch {\n"
 			"set s [::vfs::cvfs::data::getData tcl boot.tcl]\n"
@@ -384,11 +385,10 @@
 	Tcl_SetVar(interp, "tcl_rcFileName", "~/tclkitrc.tcl", TCL_GLOBAL_ONLY);
 #  else
 	Tcl_SetVar(interp, "tcl_rcFileName", "~/.tclkitrc", TCL_GLOBAL_ONLY);
 #  endif /* _WIN32 */
 #endif /* !TCLKIT_DLL */
-	Tcl_SetVar(interp, "TCLKIT_INITVFS", "1", TCL_GLOBAL_ONLY);
 
 #ifdef TCLKIT_CAN_SET_ENCODING
 	/* Set the encoding from the Environment */
 	Tcl_GetEncodingNameFromEnvironment(&encodingName);
 	Tcl_SetSystemEncoding(NULL, Tcl_DStringValue(&encodingName));