Index: README
==================================================================
--- README
+++ README
@@ -8,23 +8,23 @@
 	kitcreator [{build | retry | clean | distclean}]
 	           [{<version> | cvs_<tag> | fossil_<tag>}]
 	           [<configure_option> ...]
 
 	Where:
-		version            is a Tcl version number (e.g., 8.5.14)
+		version            is a Tcl version number (e.g., 8.6.1)
 		tag                is a CVS or fossil release tag (e.g., HEAD)
 		configure_option   option to pass to subordinate configure
 		                   scripts (e.g., --enable-64bit)
 
-	Default is to create a Tclkit from Tcl version 8.5.14
+	Default is to create a Tclkit from Tcl version 8.6.1
 
 Examples:
 	1. Create a Tclkit:
 		a. $ ./kitcreator
 
-	2. Create a Tclkit for Tcl 8.5.8:
-		a. $ ./kitcreator 8.5.8
+	2. Create a Tclkit for Tcl 8.5.15:
+		a. $ ./kitcreator 8.5.15
 
 	3. Create a Tclkit for Tcl from CVS HEAD:
 		a. $ ./kitcreator cvs_HEAD
 
 	4. Compile a 64-bit Tclkit:
@@ -46,16 +46,16 @@
 	   Note: When cross-compiling, the Tcl configure script may be unable
 	   to determine which serial support method to use. If you want serial
 	   support in a cross-compiled tclkit, specify it manually, e.g.:
 		$ ./kitcreator CFLAGS=-DUSE_TERMIOS=1 -host=mipsel-linux-uclibc
 
-	6. Compile a 64-bit Tclkit 8.5.8 using SunStudio 12.1 on Solaris/x86:
+	6. Compile a 64-bit Tclkit 8.5.15 using SunStudio 12.1 on Solaris/x86:
 		a. $ CC='/opt/sunstudio12.1/bin/cc -m64'
 		b. $ CXX='/opt/sunstudio12.1/bin/CC -m64'
 		c. $ PATCH='gpatch'
 		c. $ export CC CXX PATCH
-		d. $ ./kitcreator 8.5.8 --enable-64bit
+		d. $ ./kitcreator 8.5.15 --enable-64bit
 
 	7. To clean up post-build:
 		a. $ ./kitcreator clean
 
 	8. Create a Tclkit without Metakit4 support (falls back to Zip for storage):

Index: build/test/test
==================================================================
--- build/test/test
+++ build/test/test
@@ -1,8 +1,8 @@
 #! /bin/bash
 
-VERSIONS="8.5.14 8.6.0 cvs_HEAD"
+VERSIONS="8.5.15 8.6.1 cvs_HEAD"
 
 # Find the base directory
 for x in 1 2 3 4 __fail__; do
 	if [ "${x}" = "__fail__" ]; then
 		echo 'Unable to find KitCreator, aborting.' >&2

Index: kitcreator
==================================================================
--- kitcreator
+++ kitcreator
@@ -8,11 +8,11 @@
 		shift
 		;;
 esac
 
 # Determine which Tcl version to build
-TCLVERS="8.5.14"
+TCLVERS="8.6.1"
 if echo "$1" | grep '^[0-9][0-9]*\.' >/dev/null || echo "$1" | egrep '^(cvs|fossil)_' >/dev/null; then
 	TCLVERS="$1"
 
 	shift
 fi

Index: kitsh/buildsrc/kitsh-0.0/installvfs.tcl
==================================================================
--- kitsh/buildsrc/kitsh-0.0/installvfs.tcl
+++ kitsh/buildsrc/kitsh-0.0/installvfs.tcl
@@ -96,11 +96,16 @@
 	"zip" {
 		set kitfd [open $kitfile a+]
 		fconfigure $kitfd -translation binary
 
 		cd $vfsdir
-		set zipfd [open "|zip -r - [glob *] 2> /dev/null"]
+		if {$tcl_platform(platform) eq "windows"} {
+			set null NUL
+		} else {
+			set null /dev/null
+		}
+		set zipfd [open "|zip -r - [glob *] 2> $null"]
 		fconfigure $zipfd -translation binary
 
 		fcopy $zipfd $kitfd
 
 		close $kitfd

ADDED   tcl/patches/all/tcl-all-fix-stat64-bug2233954-mingw.diff
Index: tcl/patches/all/tcl-all-fix-stat64-bug2233954-mingw.diff
==================================================================
--- /dev/null
+++ tcl/patches/all/tcl-all-fix-stat64-bug2233954-mingw.diff
@@ -0,0 +1,12 @@
+diff -uNr Tcl_Source_Code-e7b4aca82756056a/generic/tcl.h Tcl_Source_Code-e7b4aca82756056a-bug2233954/generic/tcl.h
+--- Tcl_Source_Code-e7b4aca82756056a/generic/tcl.h	2012-02-11 07:44:35.000000000 -0800
++++ Tcl_Source_Code-e7b4aca82756056a-bug2233954/generic/tcl.h	2012-02-14 07:29:01.000000000 -0800
+@@ -454,6 +454,8 @@
+ 	typedef struct __stat64 Tcl_StatBuf;
+ #   elif (defined(_MSC_VER) && (_MSC_VER < 1400)) || defined(_USE_32BIT_TIME_T)
+ 	typedef struct _stati64	Tcl_StatBuf;
++#   elif defined(__MINGW32_VERSION)
++	typedef struct _stati64	Tcl_StatBuf;
+ #   else
+ 	typedef struct _stat32i64 Tcl_StatBuf;
+ #   endif /* _MSC_VER < 1400 */

Index: tcl/patches/all/tcl-all-fix-stat64-bug2233954-newer.diff
==================================================================
--- tcl/patches/all/tcl-all-fix-stat64-bug2233954-newer.diff
+++ tcl/patches/all/tcl-all-fix-stat64-bug2233954-newer.diff
@@ -2,11 +2,11 @@
 --- tclfossil_trunk.orig//generic/tcl.h	2012-05-04 16:11:58.000000000 -0500
 +++ tclfossil_trunk-1rsk//generic/tcl.h	2012-05-06 17:33:17.487466336 -0500
 @@ -475,6 +475,9 @@
  	/* Here is a 4-byte gap */
      } Tcl_StatBuf;
- #elif defined(HAVE_STRUCT_STAT64)
+ #elif defined(HAVE_STRUCT_STAT64) && !defined(__APPLE__)
 +#     ifdef HAVE_SYS_STAT_H
 +#       include <sys/stat.h>
 +#     endif
      typedef struct stat64 Tcl_StatBuf;
  #else