Index: kitsh/buildsrc/kitsh-0.0/kitInit.c
==================================================================
--- kitsh/buildsrc/kitsh-0.0/kitInit.c
+++ kitsh/buildsrc/kitsh-0.0/kitInit.c
@@ -126,23 +126,27 @@
 	"}\n"
 #endif /* KIT_STORAGE_MK4 */
 #ifdef KIT_STORAGE_ZIP
 	"set ::tclKitStorage \"zip\"\n"
 	"catch { load {} vfs }\n"
-	"if {[lsearch -exact [vfs::filesystem info] [info nameofexecutable]] != -1} {"
-		"set s \"\"\n"
+	"if {![info exists s]} {\n"
+		"catch {\n"
+			"set bootfile [file join [info nameofexecutable] boot.tcl]\n"
+			"if {[file exists $bootfile]} {\n"
+				"set f [open $bootfile]\n"
+				"set s [read $f]\n"
+				"close $f\n"
+			"}\n"
+		"}\n"
 	"}\n"
 	"if {![info exists s]} {\n"
 #  include "zipvfs.tcl.h"
 		"catch {\n"
 			"set ::tclKitStorage_fd [::zip::open [info nameofexecutable]]\n"
-		"} err\n"
-		"if {![catch { ::zip::stat $::tclKitStorage_fd boot.tcl sb }]} {\n"
-			"catch {\n"
-				"seek $::tclKitStorage_fd $sb(ino)\n"
-				"zip::Data $::tclKitStorage_fd sb s\n"
-			"}\n"
+			"::zip::stat $::tclKitStorage_fd boot.tcl sb\n"
+			"seek $::tclKitStorage_fd $sb(ino)\n"
+			"zip::Data $::tclKitStorage_fd sb s\n"
 		"}\n"
 	"}\n"
 #endif /* KIT_STORAGE_ZIP */
 	"if {![info exists s]} {\n"
 		"set f [open setup.tcl]\n"