@@ -1,90 +1,130 @@
 proc tclInit {} {
-  rename tclInit {}
-
-  global auto_path tcl_library tcl_libPath
-  global tcl_version tcl_rcFileName
-  
-  set noe [info nameofexecutable]
-
-  # Resolve symlinks
-  set noe [file dirname [file normalize [file join $noe __dummy__]]]
-
-  set tcl_library [file join $noe lib tcl$tcl_version]
-  set tcl_libPath [list $tcl_library [file join $noe lib]]
-
-  # get rid of a build residue
-  unset -nocomplain ::tclDefaultLibrary
-
-  # the following code only gets executed once on startup
-  if {[info exists tcl_rcFileName]} {
-    load {} vfs
-
-    # lookup and emulate "source" of lib/vfs/{vfs*.tcl,mk4vfs.tcl}
-    # must use raw MetaKit calls because VFS is not yet in place
-    set d [${::tclkitMkNamespace}::select exe.dirs parent 0 name lib]
-    set d [${::tclkitMkNamespace}::select exe.dirs parent $d name vfs]
-    
-    foreach x {vfsUtils vfslib mk4vfs} {
-      set n [${::tclkitMkNamespace}::select exe.dirs!$d.files name $x.tcl]
-      set s [${::tclkitMkNamespace}::get exe.dirs!$d.files!$n contents]
-      catch {set s [zlib decompress $s]}
-      uplevel #0 $s
-    }
-
-    # use on-the-fly decompression, if mk4vfs understands that
-    switch -- $::tclkitMkNamespace {
-        "mk" {
-            set mk4vfs::zstreamed 1
-            set vfsimpl "mk4"
-        }
-        "readkit" {
-            set mkcl_vfs::zstreamed 1
-            set vfsimpl "mkcl"
-        }
-    }
-
-    # mount the executable, i.e. make all runtime files available
-    vfs::filesystem mount $noe [list ::vfs::${vfsimpl}::handler exe]
-
-    # alter path to find encodings
-    if {[info tclversion] eq "8.4"} {
-      load {} pwb
-      librarypath [info library]
-    } else {
-      encoding dirs [list [file join [info library] encoding]] ;# TIP 258
-    }
-
-    # fix system encoding, if it wasn't properly set up (200207.004 bug)
-    if {[encoding system] eq "identity"} {
-      switch $::tcl_platform(platform) {
-        windows		{ encoding system cp1252 }
-        macintosh	{ encoding system macRoman }
-        default		{ encoding system iso8859-1 }
-      }
-    }
-
-    # now remount the executable with the correct encoding
-    #vfs::filesystem unmount $noe
-    vfs::filesystem unmount [lindex [::vfs::filesystem info] 0]
-
-    set noe [info nameofexecutable]
-
-  	# Resolve symlinks
-  	set noe [file dirname [file normalize [file join $noe __dummy__]]]
-
-    set tcl_library [file join $noe lib tcl$tcl_version]
-    set tcl_libPath [list $tcl_library [file join $noe lib]]
-    vfs::filesystem mount $noe [list ::vfs::${vfsimpl}::handler exe]
-  }
-  
-  # load config settings file if present
-  namespace eval ::vfs { variable tclkit_version 1 }
-  catch { uplevel #0 [list source [file join $noe config.tcl]] }
-
-  uplevel #0 [list source [file join $tcl_library init.tcl]]
-  
-# reset auto_path, so that init.tcl's search outside of tclkit is cancelled
-  set auto_path $tcl_libPath
-
-  unset ::tclkitMkNamespace
+	rename tclInit {}
+
+	global auto_path tcl_library tcl_libPath
+	global tcl_version tcl_rcFileName
+  
+	set noe [info nameofexecutable]
+
+	# Resolve symlinks
+	set noe [file dirname [file normalize [file join $noe __dummy__]]]
+
+	set tcl_library [file join $noe lib tcl$tcl_version]
+	set tcl_libPath [list $tcl_library [file join $noe lib]]
+
+	# get rid of a build residue
+	unset -nocomplain ::tclDefaultLibrary
+
+	# the following code only gets executed once on startup
+	if {[info exists tcl_rcFileName]} {
+		# lookup and emulate "source" of lib/vfs/{vfs*.tcl,mk4vfs.tcl}
+		switch -- $::tclKitStorage {
+			"mk4" {
+				load {} vfs
+
+				# must use raw MetaKit calls because VFS is not yet in place
+				set d [mk::select exe.dirs parent 0 name lib]
+				set d [mk::select exe.dirs parent $d name vfs]
+    
+				foreach x {vfsUtils vfslib mk4vfs} {
+					set n [mk::select exe.dirs!$d.files name $x.tcl]
+					set s [mk::get exe.dirs!$d.files!$n contents]
+					catch {set s [zlib decompress $s]}
+					uplevel #0 $s
+				}
+
+				# use on-the-fly decompression, if mk4vfs understands that
+				set mk4vfs::zstreamed 1
+
+				# Set VFS handler name
+				set vfsHandler [list ::vfs::mk4::handler exe]
+			}
+			"zip" {
+				set prefix "lib/vfs"
+				foreach file [list vfsUtils vfslib] {
+					set fullfile "${prefix}/${file}.tcl"
+
+					::zip::stat $::tclKitStorage_fd $fullfile finfo
+					seek $::tclKitStorage_fd $finfo(ino)
+					zip::Data $::tclKitStorage_fd sb s
+
+					switch -- $file {
+						"vfsUtils" {
+							# Preserve our working "::vfs::zip" implementation
+							# so we can replace it after the stub is replaced
+							# from vfsUtils
+							# The correct implementation will be provided by vfslib, 
+							# but only if we can read it
+							rename ::vfs::zip ::vfs::zip_impl
+						}
+					}
+
+					uplevel #0 $s
+
+					switch -- $file {
+						"vfsUtils" {
+							# Restore preserved "::vfs:zip" implementation
+							rename ::vfs::zip {}
+							rename ::vfs::zip_impl ::vfs::zip
+						}
+					}
+				}
+
+				seek $::tclKitStorage_fd 0
+				set vfsHandler [list ::vfs::zip::handler $::tclKitStorage_fd]
+				unset ::tclKitStorage_fd
+			}
+		}
+
+		# mount the executable, i.e. make all runtime files available
+		vfs::filesystem mount $noe $vfsHandler
+
+		# alter path to find encodings
+		if {[info tclversion] eq "8.4"} {
+			load {} pwb
+			librarypath [info library]
+		} else {
+			encoding dirs [list [file join [info library] encoding]] ;# TIP 258
+		}
+
+		# fix system encoding, if it wasn't properly set up (200207.004 bug)
+		if {[encoding system] eq "identity"} {
+			switch $::tcl_platform(platform) {
+				windows		{ encoding system cp1252 }
+				macintosh	{ encoding system macRoman }
+			        default		{ encoding system iso8859-1 }
+			}
+		}
+
+		# now remount the executable with the correct encoding
+		vfs::filesystem unmount [lindex [::vfs::filesystem info] 0]
+
+		set noe [info nameofexecutable]
+
+		# Resolve symlinks
+		set noe [file dirname [file normalize [file join $noe __dummy__]]]
+
+		set tcl_library [file join $noe lib tcl$tcl_version]
+		set tcl_libPath [list $tcl_library [file join $noe lib]]
+
+		vfs::filesystem mount $noe $vfsHandler
+	}
+  
+	# load config settings file if present
+	namespace eval ::vfs { variable tclkit_version 1 }
+	catch { uplevel #0 [list source [file join $noe config.tcl]] }
+
+	uplevel #0 [list source [file join $tcl_library init.tcl]]
+  
+	# reset auto_path, so that init.tcl's search outside of tclkit is cancelled
+	set auto_path $tcl_libPath
+
+	# This loads everything needed for "clock scan" to work
+	# "clock scan" is used within "vfs::zip", which may be
+	# loaded before this is run causing the root VFS to break
+	catch { clock scan }
+
+	# Cleanup
+	unset ::tclKitStorage
+	unset -nocomplain ::tclKitStorage_fd
 }