diff --git a/mingw-w64-tcl/002-fix-forbidden-colon-in-paths.mingw.patch b/mingw-w64-tcl/002-fix-forbidden-colon-in-paths.mingw.patch
index 8908d1175b..333e8b00a9 100644
--- a/mingw-w64-tcl/002-fix-forbidden-colon-in-paths.mingw.patch
+++ b/mingw-w64-tcl/002-fix-forbidden-colon-in-paths.mingw.patch
@@ -1,6 +1,7 @@
---- tcl8.5.9.orig/unix/installManPage	2010-09-08 21:40:48 +0400
-+++ tcl8.5.9/unix/installManPage	2011-03-24 20:34:35 +0300
-@@ -102,7 +102,7 @@
+diff -Naur tcl8.6.5-orig/unix/installManPage tcl8.6.5/unix/installManPage
+--- tcl8.6.5-orig/unix/installManPage	2016-03-01 04:59:35.000000000 +0300
++++ tcl8.6.5/unix/installManPage	2016-03-03 08:47:43.725911500 +0300
+@@ -103,7 +103,7 @@
      Target=$Target.$Section$Suffix
      rm -f $Dir/$Target $Dir/$Target.*
      if test -z "$First" ; then
diff --git a/mingw-w64-tcl/004-use-system-zlib.mingw.patch b/mingw-w64-tcl/004-use-system-zlib.mingw.patch
index 0b60b0dea0..9e338917f5 100644
--- a/mingw-w64-tcl/004-use-system-zlib.mingw.patch
+++ b/mingw-w64-tcl/004-use-system-zlib.mingw.patch
@@ -1,5 +1,6 @@
---- tcl8.6.1/win/configure.in.orig	2013-10-01 00:24:28.726238700 +0000
-+++ tcl8.6.1/win/configure.in	2013-10-01 00:41:08.253662600 +0000
+diff -Naur tcl8.6.5-orig/win/configure.in tcl8.6.5/win/configure.in
+--- tcl8.6.5-orig/win/configure.in	2016-03-01 04:59:35.000000000 +0300
++++ tcl8.6.5/win/configure.in	2016-03-03 08:47:47.115572500 +0300
 @@ -127,16 +127,7 @@
    tcl_ok=yes
  ])
@@ -7,20 +8,21 @@
 -  AC_SUBST(ZLIB_DLL_FILE,[\${ZLIB_DLL_FILE}])
 -  AS_IF([test "$do64bit" = "yes"], [
 -    AS_IF([test "$GCC" == "yes"],[
--      AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win64/libz.dll.a])
+-      AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64/libz.dll.a])
 -    ], [
--      AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win64/zdll.lib])
+-      AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64/zdll.lib])
 -    ])
 -  ], [
--    AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win32/zdll.lib])
+-    AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win32/zdll.lib])
 -  ])
 +    AC_SUBST(ZLIB_LIBS,[-lz])
  ], [
    AC_SUBST(ZLIB_OBJS,[\${ZLIB_OBJS}])
  ])
---- tcl8.6.1/win/Makefile.in.orig	2013-09-19 20:17:14.000000000 +0000
-+++ tcl8.6.1/win/Makefile.in	2013-10-01 00:41:47.767680200 +0000
-@@ -139,9 +139,8 @@
+diff -Naur tcl8.6.5-orig/win/Makefile.in tcl8.6.5/win/Makefile.in
+--- tcl8.6.5-orig/win/Makefile.in	2016-03-01 04:59:35.000000000 +0300
++++ tcl8.6.5/win/Makefile.in	2016-03-03 08:47:47.129571100 +0300
+@@ -146,9 +146,8 @@
  REG_LIB_FILE		= @LIBPREFIX@tclreg$(REGVER)${LIBSUFFIX}
  TEST_DLL_FILE		= tcltest$(VER)${DLLSUFFIX}
  TEST_LIB_FILE		= @LIBPREFIX@tcltest$(VER)${LIBSUFFIX}
@@ -31,8 +33,17 @@
  STATIC_LIBRARIES	= $(TCL_LIB_FILE)
  
  TCLSH			= tclsh$(VER)${EXESUFFIX}
-@@ -436,7 +435,7 @@
- 	@MAKE_LIB@ ${STUB_OBJS}
+@@ -188,7 +187,7 @@
+ SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+ SHLIB_SUFFIX	= @SHLIB_SUFFIX@
+-LIBS		= @LIBS@ $(shell $(CYGPATH) '@ZLIB_LIBS@')
++LIBS		= @LIBS@ @ZLIB_LIBS@
+ 
+ RMDIR		= rm -rf
+ MKDIR		= mkdir -p
+@@ -446,7 +445,7 @@
+ 	@MAKE_STUB_LIB@ ${STUB_OBJS}
  	@POST_MAKE_LIB@
  
 -${TCL_DLL_FILE}: ${TCL_OBJS} tcl.$(RES) @ZLIB_DLL_FILE@
@@ -40,13 +51,13 @@
  	@$(RM) ${TCL_DLL_FILE} $(TCL_LIB_FILE)
  	@MAKE_DLL@ ${TCL_OBJS} tcl.$(RES) $(SHLIB_LD_LIBS)
  	@VC_MANIFEST_EMBED_DLL@
-@@ -456,14 +455,6 @@
+@@ -466,14 +465,6 @@
  	@$(RM) ${TEST_DLL_FILE} ${TEST_LIB_FILE}
  	@MAKE_DLL@ ${TCLTEST_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS)
  
 -# use pre-built zlib1.dll
 -${ZLIB_DLL_FILE}: ${TCL_STUB_LIB_FILE}
--	@if test "@ZLIB_LIBS@set" != "${ZLIB_DIR}/win32/zdll.libset" ; then \
+-	@if test "@ZLIB_LIBS@set" != "${ZLIB_DIR_NATIVE}/win32/zdll.libset" ; then \
 -		$(COPY) $(ZLIB_DIR)/win64/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \
 -	else \
 -		$(COPY) $(ZLIB_DIR)/win32/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \
@@ -55,7 +66,7 @@
  # Add the object extension to the implicit rules. By default .obj is not
  # automatically added.
  
-@@ -569,7 +560,7 @@
+@@ -579,7 +570,7 @@
  		else true; \
  		fi; \
  	    done;
diff --git a/mingw-w64-tcl/005-no-xc.mingw.patch b/mingw-w64-tcl/005-no-xc.mingw.patch
index 704f52602a..77a92fd47d 100644
--- a/mingw-w64-tcl/005-no-xc.mingw.patch
+++ b/mingw-w64-tcl/005-no-xc.mingw.patch
@@ -1,5 +1,6 @@
---- tcl8.6.1/win/configure.in.orig	2013-10-01 02:00:39.096982800 +0000
-+++ tcl8.6.1/win/configure.in	2013-10-01 02:00:48.523179700 +0000
+diff -Naur tcl8.6.5-orig/win/configure.in tcl8.6.5/win/configure.in
+--- tcl8.6.5-orig/win/configure.in	2016-03-03 08:47:47.861497900 +0300
++++ tcl8.6.5/win/configure.in	2016-03-03 08:47:47.952488800 +0300
 @@ -105,15 +105,7 @@
  
  SC_CONFIG_CFLAGS
diff --git a/mingw-w64-tcl/006-proper-implib-name.mingw.patch b/mingw-w64-tcl/006-proper-implib-name.mingw.patch
index d052acecdf..01f459f794 100644
--- a/mingw-w64-tcl/006-proper-implib-name.mingw.patch
+++ b/mingw-w64-tcl/006-proper-implib-name.mingw.patch
@@ -1,6 +1,24 @@
---- tcl8.6.1/win/Makefile.in.orig	2013-10-01 02:03:26.158196800 +0000
-+++ tcl8.6.1/win/Makefile.in	2013-10-01 02:23:41.668547100 +0000
-@@ -134,11 +134,11 @@
+diff -Naur tcl8.6.5-orig/win/configure.in tcl8.6.5/win/configure.in
+--- tcl8.6.5-orig/win/configure.in	2016-03-03 08:47:48.632420800 +0300
++++ tcl8.6.5/win/configure.in	2016-03-03 08:47:48.753408700 +0300
+@@ -284,7 +284,12 @@
+ eval "TCL_BUILD_STUB_LIB_PATH=\"`$CYGPATH $(pwd)`/${TCL_STUB_LIB_FILE}\""
+ eval "TCL_STUB_LIB_PATH=\"${libdir}/${TCL_STUB_LIB_FILE}\""
+ 
+-eval "TCL_LIB_FILE=\"${LIBPREFIX}tcl${VER}${LIBSUFFIX}\""
++if test ${SHARED_BUILD} = 0 ; then
++ eval "TCL_LIB_FILE=\"${LIBPREFIX}tcl${VER}${LIBSUFFIX}\""
++else
++ eval "TCL_LIB_FILE=\"${LIBPREFIX}tcl${VER}${DLLSUFFIX}.a\""
++fi
++
+ eval "TCL_BUILD_LIB_SPEC=\"-L`$CYGPATH $(pwd)` -ltcl${VER}${FLAGSUFFIX}\""
+ eval "TCL_LIB_SPEC=\"-L${libdir} -ltcl${VER}${FLAGSUFFIX}\""
+ 
+diff -Naur tcl8.6.5-orig/win/Makefile.in tcl8.6.5/win/Makefile.in
+--- tcl8.6.5-orig/win/Makefile.in	2016-03-03 08:47:47.868497200 +0300
++++ tcl8.6.5/win/Makefile.in	2016-03-03 08:47:48.739410100 +0300
+@@ -141,11 +141,11 @@
  TCL_DLL_FILE		= @TCL_DLL_FILE@
  TCL_LIB_FILE		= @TCL_LIB_FILE@
  DDE_DLL_FILE		= tcldde$(DDEVER)${DLLSUFFIX}
@@ -15,27 +33,11 @@
  
  SHARED_LIBRARIES 	= $(TCL_DLL_FILE)
  STATIC_LIBRARIES	= $(TCL_LIB_FILE)
---- tcl8.6.1/win/configure.in.orig	2013-10-01 02:03:26.183200000 +0000
-+++ tcl8.6.1/win/configure.in	2013-10-01 02:26:30.748017400 +0000
-@@ -284,7 +284,13 @@
- eval "TCL_BUILD_STUB_LIB_PATH=\"`pwd`/${TCL_STUB_LIB_FILE}\""
- eval "TCL_STUB_LIB_PATH=\"${libdir}/${TCL_STUB_LIB_FILE}\""
- 
--eval "TCL_LIB_FILE=\"${LIBPREFIX}tcl${VER}${LIBSUFFIX}\""
-+if test ${SHARED_BUILD} = 0 ; then
-+ eval "TCL_LIB_FILE=\"${LIBPREFIX}tcl${VER}${LIBSUFFIX}\""
-+else
-+ eval "TCL_LIB_FILE=\"${LIBPREFIX}tcl${VER}${DLLSUFFIX}.a\""
-+fi
-+
-+
- eval "TCL_BUILD_LIB_SPEC=\"-L`pwd` -ltcl${VER}${FLAGSUFFIX}\""
- eval "TCL_LIB_SPEC=\"-L${libdir} -ltcl${VER}${FLAGSUFFIX}\""
- 
---- tcl8.6.1/win/tcl.m4.orig	2013-09-19 20:17:14.000000000 +0000
-+++ tcl8.6.1/win/tcl.m4	2013-10-01 02:27:11.434183900 +0000
+diff -Naur tcl8.6.5-orig/win/tcl.m4 tcl8.6.5/win/tcl.m4
+--- tcl8.6.5-orig/win/tcl.m4	2016-03-01 04:59:35.000000000 +0300
++++ tcl8.6.5/win/tcl.m4	2016-03-03 08:47:48.763407700 +0300
 @@ -715,7 +715,7 @@
- 	SHLIB_LD='${CC} -shared ${CFLAGS}'
+ 	SHLIB_LD='${CC} -shared'
  	SHLIB_LD_LIBS='${LIBS}'
  	MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -o \[$]@ ${extra_ldflags} \
 -	    -Wl,--out-implib,\$(patsubst %.dll,lib%.a,\[$]@)"
diff --git a/mingw-w64-tcl/007-install.mingw.patch b/mingw-w64-tcl/007-install.mingw.patch
index 9aa621dfc2..15a9bad678 100644
--- a/mingw-w64-tcl/007-install.mingw.patch
+++ b/mingw-w64-tcl/007-install.mingw.patch
@@ -1,6 +1,7 @@
---- tcl8.6.1/win/Makefile.in.orig	2013-10-01 02:23:41.668547100 +0000
-+++ tcl8.6.1/win/Makefile.in	2013-10-01 02:31:10.015979900 +0000
-@@ -102,6 +102,8 @@
+diff -Naur tcl8.6.5-orig/win/Makefile.in tcl8.6.5/win/Makefile.in
+--- tcl8.6.5-orig/win/Makefile.in	2016-03-03 08:47:49.434340600 +0300
++++ tcl8.6.5/win/Makefile.in	2016-03-03 08:47:49.599324100 +0300
+@@ -103,6 +103,8 @@
  COMPAT_DIR		= $(TOP_DIR)/compat
  PKGS_DIR		= $(TOP_DIR)/pkgs
  ZLIB_DIR		= $(COMPAT_DIR)/zlib
@@ -9,7 +10,23 @@
  
  # Converts a POSIX path to a Windows native path.
  CYGPATH			= @CYGPATH@
-@@ -663,6 +665,28 @@
+@@ -195,8 +197,14 @@
+ RM		= rm -f
+ COPY		= cp
+ 
++INSTALL			= $(SHELL) $(UNIX_DIR)/install-sh -c
++INSTALL_PROGRAM		= ${INSTALL}
++INSTALL_LIBRARY		= ${INSTALL}
++INSTALL_DATA		= ${INSTALL} -m 644
++INSTALL_DATA_DIR	= ${INSTALL} -d -m 755
++
+ CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${TCL_SHLIB_CFLAGS} \
+--I"${ZLIB_DIR_NATIVE}" -I"${GENERIC_DIR_NATIVE}" -DTCL_TOMMATH \
++-I"${GENERIC_DIR_NATIVE}" -DTCL_TOMMATH \
+ -DMP_PREC=4 -I"${TOMMATH_DIR_NATIVE}" -I"${WIN_DIR_NATIVE}" \
+ ${AC_FLAGS} ${COMPILE_DEBUG_FLAGS} ${NO_DEPRECATED_FLAGS}
+ 
+@@ -673,6 +681,28 @@
  	    "$(ROOT_DIR)/library/msgs" "$(SCRIPT_INSTALL_DIR)/msgs"
  
  install-doc: doc
@@ -38,164 +55,3 @@
  
  # Optional target to install private headers
  install-private-headers: libraries
---- tcl8.6.1/win/Makefile.in.orig	2013-10-01 02:32:22.875732000 +0000
-+++ tcl8.6.1/win/Makefile.in	2013-10-01 02:45:27.482364300 +0000
-@@ -190,6 +190,12 @@
- RM		= rm -f
- COPY		= cp
- 
-+INSTALL			= $(SHELL) $(UNIX_DIR)/install-sh -c
-+INSTALL_PROGRAM		= ${INSTALL}
-+INSTALL_LIBRARY		= ${INSTALL}
-+INSTALL_DATA		= ${INSTALL} -m 644
-+INSTALL_DATA_DIR	= ${INSTALL} -d -m 755
-+
- CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${TCL_SHLIB_CFLAGS} -I"${ZLIB_DIR}" \
- -I"${GENERIC_DIR_NATIVE}" -DTCL_TOMMATH -DMP_PREC=4 -I"${TOMMATH_DIR_NATIVE}" \
- -I"${WIN_DIR_NATIVE}" ${AC_FLAGS} \
-@@ -549,8 +555,7 @@
- 	    do \
- 	    if [ ! -d $$i ] ; then \
- 		echo "Making directory $$i"; \
--		$(MKDIR) $$i; \
--		chmod 755 $$i; \
-+		$(INSTALL_DATA_DIR) $$i; \
- 		else true; \
- 		fi; \
- 	    done;
-@@ -558,7 +563,7 @@
- 	    do \
- 	    if [ ! -d $(LIB_INSTALL_DIR)/$$i ] ; then \
- 		echo "Making directory $(LIB_INSTALL_DIR)/$$i"; \
--		$(MKDIR) $(LIB_INSTALL_DIR)/$$i; \
-+		$(INSTALL_DATA_DIR) $(LIB_INSTALL_DIR)/$$i; \
- 		else true; \
- 		fi; \
- 	    done;
-@@ -566,35 +571,35 @@
- 	    do \
- 	    if [ -f $$i ]; then \
- 		echo "Installing $$i to $(BIN_INSTALL_DIR)/"; \
--		$(COPY) $$i "$(BIN_INSTALL_DIR)"; \
-+		$(INSTALL_PROGRAM) $$i "$(BIN_INSTALL_DIR)"; \
- 	    fi; \
- 	    done
- 	@for i in tclConfig.sh tclooConfig.sh $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE); \
- 	    do \
- 	    if [ -f $$i ]; then \
- 		echo "Installing $$i to $(LIB_INSTALL_DIR)/"; \
--		$(COPY) $$i "$(LIB_INSTALL_DIR)"; \
-+		$(INSTALL_DATA) $$i "$(LIB_INSTALL_DIR)"; \
- 	    fi; \
- 	    done
- 	@if [ -f $(DDE_DLL_FILE) ]; then \
- 	    echo Installing $(DDE_DLL_FILE); \
--	    $(COPY) $(DDE_DLL_FILE) $(LIB_INSTALL_DIR)/dde${DDEDOTVER}; \
--	    $(COPY) $(ROOT_DIR)/library/dde/pkgIndex.tcl \
-+	    $(INSTALL_LIBRARY) $(DDE_DLL_FILE) $(LIB_INSTALL_DIR)/dde${DDEDOTVER}; \
-+	    $(INSTALL_LIBRARY) $(ROOT_DIR)/library/dde/pkgIndex.tcl \
- 		$(LIB_INSTALL_DIR)/dde${DDEDOTVER}; \
- 	    fi
- 	@if [ -f $(DDE_LIB_FILE) ]; then \
- 	    echo Installing $(DDE_LIB_FILE); \
--	    $(COPY) $(DDE_LIB_FILE) $(LIB_INSTALL_DIR)/dde${DDEDOTVER}; \
-+	    $(INSTALL_DATA) $(DDE_LIB_FILE) $(LIB_INSTALL_DIR)/dde${DDEDOTVER}; \
- 	    fi
- 	@if [ -f $(REG_DLL_FILE) ]; then \
- 	    echo Installing $(REG_DLL_FILE); \
--	    $(COPY) $(REG_DLL_FILE) $(LIB_INSTALL_DIR)/reg${REGDOTVER}; \
--	    $(COPY) $(ROOT_DIR)/library/reg/pkgIndex.tcl \
-+	    $(INSTALL_LIBRARY) $(REG_DLL_FILE) $(LIB_INSTALL_DIR)/reg${REGDOTVER}; \
-+	    $(INSTALL_LIBRARY) $(ROOT_DIR)/library/reg/pkgIndex.tcl \
- 		$(LIB_INSTALL_DIR)/reg${REGDOTVER}; \
- 	    fi
- 	@if [ -f $(REG_LIB_FILE) ]; then \
- 	    echo Installing $(REG_LIB_FILE); \
--	    $(COPY) $(REG_LIB_FILE) $(LIB_INSTALL_DIR)/reg${REGDOTVER}; \
-+	    $(INSTALL_DATA) $(REG_LIB_FILE) $(LIB_INSTALL_DIR)/reg${REGDOTVER}; \
- 	    fi
- 
- install-libraries: libraries install-tzdata install-msgs
-@@ -603,7 +608,7 @@
- 	    do \
- 	    if [ ! -d $$i ] ; then \
- 		echo "Making directory $$i"; \
--		$(MKDIR) $$i; \
-+		$(INSTALL_DATA_DIR) $$i; \
- 		else true; \
- 		fi; \
- 	    done;
-@@ -611,7 +616,7 @@
- 	    do \
- 	    if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
- 		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
--		$(MKDIR) $(SCRIPT_INSTALL_DIR)/$$i; \
-+		$(INSTALL_DATA_DIR) $(SCRIPT_INSTALL_DIR)/$$i; \
- 		else true; \
- 		fi; \
- 	    done;
-@@ -622,36 +627,36 @@
- 		"$(GENERIC_DIR)/tclTomMath.h" \
- 		"$(GENERIC_DIR)/tclTomMathDecls.h"; \
- 	    do \
--	    $(COPY) "$$i" "$(INCLUDE_INSTALL_DIR)"; \
-+	    $(INSTALL_DATA) "$$i" "$(INCLUDE_INSTALL_DIR)"; \
- 	    done;
- 	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
- 	@for i in $(ROOT_DIR)/library/*.tcl $(ROOT_DIR)/library/tclIndex; \
- 	    do \
--	    $(COPY) "$$i" "$(SCRIPT_INSTALL_DIR)"; \
-+	    $(INSTALL_DATA) "$$i" "$(SCRIPT_INSTALL_DIR)"; \
- 	    done;
- 	@echo "Installing library http1.0 directory";
- 	@for j in $(ROOT_DIR)/library/http1.0/*.tcl; \
- 	    do \
--	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/http1.0"; \
-+	    $(INSTALL_DATA) "$$j" "$(SCRIPT_INSTALL_DIR)/http1.0"; \
- 	    done;
- 	@echo "Installing package http 2.8.8 as a Tcl Module";
--	@$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.6/http-2.8.8.tm;
-+	@$(INSTALL_DATA) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.6/http-2.8.8.tm;
- 	@echo "Installing library opt0.4 directory";
- 	@for j in $(ROOT_DIR)/library/opt/*.tcl; \
- 	    do \
--	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/opt0.4"; \
-+	    $(INSTALL_DATA) "$$j" "$(SCRIPT_INSTALL_DIR)/opt0.4"; \
- 	    done;
- 	@echo "Installing package msgcat 1.5.2 as a Tcl Module";
--	@$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/msgcat-1.5.2.tm;
-+	@$(INSTALL_DATA) $(ROOT_DIR)/library/msgcat/msgcat.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/msgcat-1.5.2.tm;
- 	@echo "Installing package tcltest 2.3.8 as a Tcl Module";
--	@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/tcltest-2.3.8.tm;
-+	@$(INSTALL_DATA) $(ROOT_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/tcltest-2.3.8.tm;
- 	@echo "Installing package platform 1.0.13 as a Tcl Module";
--	@$(COPY) $(ROOT_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform-1.0.13.tm;
-+	@$(INSTALL_DATA) $(ROOT_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform-1.0.13.tm;
- 	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
--	@$(COPY) $(ROOT_DIR)/library/platform/shell.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform/shell-1.1.4.tm;
-+	@$(INSTALL_DATA) $(ROOT_DIR)/library/platform/shell.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform/shell-1.1.4.tm;
- 	@echo "Installing encodings";
- 	@for i in $(ROOT_DIR)/library/encoding/*.enc ; do \
--		$(COPY) "$$i" "$(SCRIPT_INSTALL_DIR)/encoding"; \
-+		$(INSTALL_DATA) "$$i" "$(SCRIPT_INSTALL_DIR)/encoding"; \
- 	done;
- 
- install-tzdata:
-@@ -694,7 +699,7 @@
- 	    do \
- 	    if [ ! -d $$i ] ; then \
- 		echo "Making directory $$i"; \
--		$(MKDIR) $$i; \
-+		$(INSTALL_DATA_DIR) $$i; \
- 		else true; \
- 		fi; \
- 	    done;
-@@ -704,7 +709,7 @@
- 		"$(GENERIC_DIR)/tclOOInt.h" "$(GENERIC_DIR)/tclOOIntDecls.h" \
- 		"$(WIN_DIR)/tclWinPort.h" ; \
- 	    do \
--	    $(COPY) "$$i" "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \
-+	    $(INSTALL_DATA) "$$i" "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \
- 	    done;
- 
- # Specifying TESTFLAGS on the command line is the standard way to pass args to
diff --git a/mingw-w64-tcl/008-tcl-8.5.14-hidden.patch b/mingw-w64-tcl/008-tcl-8.5.14-hidden.patch
index aa977d03a0..0c8055d91c 100644
--- a/mingw-w64-tcl/008-tcl-8.5.14-hidden.patch
+++ b/mingw-w64-tcl/008-tcl-8.5.14-hidden.patch
@@ -1,8 +1,7 @@
-diff --git a/generic/tclInt.h b/generic/tclInt.h
-index 92251fe..b79edf6 100644
---- a/generic/tclInt.h
-+++ b/generic/tclInt.h
-@@ -2807,7 +2807,7 @@ MODULE_SCOPE void	TclClockInit(Tcl_Interp *interp);
+diff -Naur tcl8.6.5-orig/generic/tclInt.h tcl8.6.5/generic/tclInt.h
+--- tcl8.6.5-orig/generic/tclInt.h	2016-02-25 23:12:37.000000000 +0300
++++ tcl8.6.5/generic/tclInt.h	2016-03-03 08:47:50.393244700 +0300
+@@ -3204,7 +3204,7 @@
  MODULE_SCOPE int	TclClockOldscanObjCmd(
  			    ClientData clientData, Tcl_Interp *interp,
  			    int objc, Tcl_Obj *const objv[]);
@@ -11,8 +10,8 @@ index 92251fe..b79edf6 100644
  			    Tcl_Interp *interp, int objc,
  			    Tcl_Obj *const objv[]);
  MODULE_SCOPE int	Tcl_ConcatObjCmd(ClientData clientData,
-@@ -2968,7 +2968,7 @@ MODULE_SCOPE int	Tcl_RegsubObjCmd(ClientData clientData,
- MODULE_SCOPE int	Tcl_RenameObjCmd(ClientData clientData,
+@@ -3387,7 +3387,7 @@
+ MODULE_SCOPE int	Tcl_RepresentationCmd(ClientData clientData,
  			    Tcl_Interp *interp, int objc,
  			    Tcl_Obj *const objv[]);
 -MODULE_SCOPE int	Tcl_ReturnObjCmd(ClientData clientData,
@@ -20,10 +19,9 @@ index 92251fe..b79edf6 100644
  			    Tcl_Interp *interp, int objc,
  			    Tcl_Obj *const objv[]);
  MODULE_SCOPE int	Tcl_ScanObjCmd(ClientData clientData,
-diff --git a/generic/tclPort.h b/generic/tclPort.h
-index 12a60db..d817154 100644
---- a/generic/tclPort.h
-+++ b/generic/tclPort.h
+diff -Naur tcl8.6.5-orig/generic/tclPort.h tcl8.6.5/generic/tclPort.h
+--- tcl8.6.5-orig/generic/tclPort.h	2016-02-25 23:12:37.000000000 +0300
++++ tcl8.6.5/generic/tclPort.h	2016-03-03 08:47:50.394244600 +0300
 @@ -20,7 +20,7 @@
  #if defined(_WIN32)
  #   include "tclWinPort.h"
diff --git a/mingw-w64-tcl/009-fix-using-gnu-print.patch b/mingw-w64-tcl/009-fix-using-gnu-print.patch
index e3f9191bce..a515137080 100644
--- a/mingw-w64-tcl/009-fix-using-gnu-print.patch
+++ b/mingw-w64-tcl/009-fix-using-gnu-print.patch
@@ -1,6 +1,7 @@
---- tcl8.6.1/generic/tcl.h.orig	2014-03-12 07:58:58.634400000 +0400
-+++ tcl8.6.1/generic/tcl.h	2014-03-12 07:59:32.845200000 +0400
-@@ -390,7 +390,7 @@
+diff -Naur tcl8.6.5-orig/generic/tcl.h tcl8.6.5/generic/tcl.h
+--- tcl8.6.5-orig/generic/tcl.h	2016-02-29 22:09:35.000000000 +0300
++++ tcl8.6.5/generic/tcl.h	2016-03-03 08:47:51.104173600 +0300
+@@ -389,7 +389,7 @@
   */
  
  #if !defined(TCL_WIDE_INT_TYPE)&&!defined(TCL_WIDE_INT_IS_LONG)
@@ -9,9 +10,10 @@
  #      define TCL_WIDE_INT_TYPE __int64
  #      ifdef __BORLANDC__
  #         define TCL_LL_MODIFIER	"L"
---- tcl8.6.1/win/tclWinInt.h.orig	2014-03-12 08:19:49.204200000 +0400
-+++ tcl8.6.1/win/tclWinInt.h	2014-03-12 08:47:03.228800000 +0400
-@@ -28,7 +28,11 @@
+diff -Naur tcl8.6.5-orig/win/tclWinInt.h tcl8.6.5/win/tclWinInt.h
+--- tcl8.6.5-orig/win/tclWinInt.h	2016-02-25 23:12:38.000000000 +0300
++++ tcl8.6.5/win/tclWinInt.h	2016-03-03 08:47:51.129171100 +0300
+@@ -45,7 +45,11 @@
  #endif
  
  #ifdef _WIN64
diff --git a/mingw-w64-tcl/010-dont-link-shared-with--static-libgcc.patch b/mingw-w64-tcl/010-dont-link-shared-with--static-libgcc.patch
index 81e9114eb9..77a2db6462 100644
--- a/mingw-w64-tcl/010-dont-link-shared-with--static-libgcc.patch
+++ b/mingw-w64-tcl/010-dont-link-shared-with--static-libgcc.patch
@@ -1,7 +1,7 @@
-diff -urN tcl8.6.4.orig/pkgs/itcl4.0.3/tclconfig/tcl.m4 tcl8.6.4/pkgs/itcl4.0.3/tclconfig/tcl.m4
---- tcl8.6.4.orig/pkgs/itcl4.0.3/tclconfig/tcl.m4	2014-08-26 16:23:03.000000000 +0100
-+++ tcl8.6.4/pkgs/itcl4.0.3/tclconfig/tcl.m4	2014-11-03 21:10:40.124589900 +0000
-@@ -3354,9 +3354,6 @@
+diff -Naur tcl8.6.5-orig/pkgs/itcl4.0.4/tclconfig/tcl.m4 tcl8.6.5/pkgs/itcl4.0.4/tclconfig/tcl.m4
+--- tcl8.6.5-orig/pkgs/itcl4.0.4/tclconfig/tcl.m4	2016-03-01 04:59:33.000000000 +0300
++++ tcl8.6.5/pkgs/itcl4.0.4/tclconfig/tcl.m4	2016-03-03 08:47:51.861097900 +0300
+@@ -3377,9 +3377,6 @@
  		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
  	    fi
  	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
@@ -11,10 +11,10 @@ diff -urN tcl8.6.4.orig/pkgs/itcl4.0.3/tclconfig/tcl.m4 tcl8.6.4/pkgs/itcl4.0.3/
  	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
  	else
  	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
-diff -urN tcl8.6.4.orig/pkgs/sqlite3.8.8.3/configure tcl8.6.4/pkgs/sqlite3.8.8.3/configure
---- tcl8.6.4.orig/pkgs/sqlite3.8.8.3/configure	2014-08-15 15:09:19.000000000 +0100
-+++ tcl8.6.4/pkgs/sqlite3.8.8.3/configure	2014-11-03 21:10:50.245375100 +0000
-@@ -8710,9 +8710,6 @@
+diff -Naur tcl8.6.5-orig/pkgs/sqlite3.11.0/configure tcl8.6.5/pkgs/sqlite3.11.0/configure
+--- tcl8.6.5-orig/pkgs/sqlite3.11.0/configure	2016-02-16 21:34:47.000000000 +0300
++++ tcl8.6.5/pkgs/sqlite3.11.0/configure	2016-03-03 08:47:51.880096000 +0300
+@@ -8852,9 +8852,6 @@
  		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
  	    fi
  	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
@@ -24,10 +24,10 @@ diff -urN tcl8.6.4.orig/pkgs/sqlite3.8.8.3/configure tcl8.6.4/pkgs/sqlite3.8.8.3
  	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
  	else
  	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
-diff -urN tcl8.6.4.orig/pkgs/sqlite3.8.8.3/tclconfig/tcl.m4 tcl8.6.4/pkgs/sqlite3.8.8.3/tclconfig/tcl.m4
---- tcl8.6.4.orig/pkgs/sqlite3.8.8.3/tclconfig/tcl.m4	2014-08-26 16:23:05.000000000 +0100
-+++ tcl8.6.4/pkgs/sqlite3.8.8.3/tclconfig/tcl.m4	2014-11-03 21:53:20.090664400 +0000
-@@ -3354,9 +3354,6 @@
+diff -Naur tcl8.6.5-orig/pkgs/sqlite3.11.0/tclconfig/tcl.m4 tcl8.6.5/pkgs/sqlite3.11.0/tclconfig/tcl.m4
+--- tcl8.6.5-orig/pkgs/sqlite3.11.0/tclconfig/tcl.m4	2016-03-01 04:59:34.000000000 +0300
++++ tcl8.6.5/pkgs/sqlite3.11.0/tclconfig/tcl.m4	2016-03-03 08:47:51.902093800 +0300
+@@ -3377,9 +3377,6 @@
  		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
  	    fi
  	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
@@ -37,10 +37,10 @@ diff -urN tcl8.6.4.orig/pkgs/sqlite3.8.8.3/tclconfig/tcl.m4 tcl8.6.4/pkgs/sqlite
  	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
  	else
  	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
-diff -urN tcl8.6.4.orig/pkgs/tdbc1.0.3/tclconfig/tcl.m4 tcl8.6.4/pkgs/tdbc1.0.3/tclconfig/tcl.m4
---- tcl8.6.4.orig/pkgs/tdbc1.0.3/tclconfig/tcl.m4	2014-08-14 18:25:28.000000000 +0100
-+++ tcl8.6.4/pkgs/tdbc1.0.3/tclconfig/tcl.m4	2014-11-03 21:53:17.562843400 +0000
-@@ -3354,9 +3354,6 @@
+diff -Naur tcl8.6.5-orig/pkgs/tdbc1.0.4/tclconfig/tcl.m4 tcl8.6.5/pkgs/tdbc1.0.4/tclconfig/tcl.m4
+--- tcl8.6.5-orig/pkgs/tdbc1.0.4/tclconfig/tcl.m4	2015-10-13 14:57:48.000000000 +0300
++++ tcl8.6.5/pkgs/tdbc1.0.4/tclconfig/tcl.m4	2016-03-03 08:47:51.940090000 +0300
+@@ -3377,9 +3377,6 @@
  		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
  	    fi
  	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
@@ -50,10 +50,10 @@ diff -urN tcl8.6.4.orig/pkgs/tdbc1.0.3/tclconfig/tcl.m4 tcl8.6.4/pkgs/tdbc1.0.3/
  	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
  	else
  	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
-diff -urN tcl8.6.4.orig/pkgs/tdbcmysql1.0.3/tclconfig/tcl.m4 tcl8.6.4/pkgs/tdbcmysql1.0.3/tclconfig/tcl.m4
---- tcl8.6.4.orig/pkgs/tdbcmysql1.0.3/tclconfig/tcl.m4	2014-08-26 16:23:06.000000000 +0100
-+++ tcl8.6.4/pkgs/tdbcmysql1.0.3/tclconfig/tcl.m4	2014-11-03 21:53:14.185914500 +0000
-@@ -3354,9 +3354,6 @@
+diff -Naur tcl8.6.5-orig/pkgs/tdbcmysql1.0.4/tclconfig/tcl.m4 tcl8.6.5/pkgs/tdbcmysql1.0.4/tclconfig/tcl.m4
+--- tcl8.6.5-orig/pkgs/tdbcmysql1.0.4/tclconfig/tcl.m4	2015-10-13 14:57:39.000000000 +0300
++++ tcl8.6.5/pkgs/tdbcmysql1.0.4/tclconfig/tcl.m4	2016-03-03 08:47:51.957088300 +0300
+@@ -3377,9 +3377,6 @@
  		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
  	    fi
  	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
@@ -63,10 +63,10 @@ diff -urN tcl8.6.4.orig/pkgs/tdbcmysql1.0.3/tclconfig/tcl.m4 tcl8.6.4/pkgs/tdbcm
  	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
  	else
  	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
-diff -urN tcl8.6.4.orig/pkgs/tdbcodbc1.0.3/tclconfig/tcl.m4 tcl8.6.4/pkgs/tdbcodbc1.0.3/tclconfig/tcl.m4
---- tcl8.6.4.orig/pkgs/tdbcodbc1.0.3/tclconfig/tcl.m4	2014-08-26 16:23:06.000000000 +0100
-+++ tcl8.6.4/pkgs/tdbcodbc1.0.3/tclconfig/tcl.m4	2014-11-03 21:11:17.741366700 +0000
-@@ -3354,9 +3354,6 @@
+diff -Naur tcl8.6.5-orig/pkgs/tdbcodbc1.0.4/tclconfig/tcl.m4 tcl8.6.5/pkgs/tdbcodbc1.0.4/tclconfig/tcl.m4
+--- tcl8.6.5-orig/pkgs/tdbcodbc1.0.4/tclconfig/tcl.m4	2016-03-01 04:59:34.000000000 +0300
++++ tcl8.6.5/pkgs/tdbcodbc1.0.4/tclconfig/tcl.m4	2016-03-03 08:47:52.006083400 +0300
+@@ -3377,9 +3377,6 @@
  		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
  	    fi
  	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
@@ -76,10 +76,10 @@ diff -urN tcl8.6.4.orig/pkgs/tdbcodbc1.0.3/tclconfig/tcl.m4 tcl8.6.4/pkgs/tdbcod
  	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
  	else
  	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
-diff -urN tcl8.6.4.orig/pkgs/tdbcpostgres1.0.3/configure tcl8.6.4/pkgs/tdbcpostgres1.0.3/configure
---- tcl8.6.4.orig/pkgs/tdbcpostgres1.0.3/configure	2014-08-14 18:59:04.000000000 +0100
-+++ tcl8.6.4/pkgs/tdbcpostgres1.0.3/configure	2014-11-03 21:11:28.422723000 +0000
-@@ -9234,9 +9234,6 @@
+diff -Naur tcl8.6.5-orig/pkgs/tdbcpostgres1.0.4/configure tcl8.6.5/pkgs/tdbcpostgres1.0.4/configure
+--- tcl8.6.5-orig/pkgs/tdbcpostgres1.0.4/configure	2016-01-28 21:07:18.000000000 +0300
++++ tcl8.6.5/pkgs/tdbcpostgres1.0.4/configure	2016-03-03 08:47:52.078076200 +0300
+@@ -9446,9 +9446,6 @@
  		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
  	    fi
  	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
@@ -89,10 +89,10 @@ diff -urN tcl8.6.4.orig/pkgs/tdbcpostgres1.0.3/configure tcl8.6.4/pkgs/tdbcpostg
  	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
  	else
  	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
-diff -urN tcl8.6.4.orig/pkgs/tdbcpostgres1.0.3/tclconfig/tcl.m4 tcl8.6.4/pkgs/tdbcpostgres1.0.3/tclconfig/tcl.m4
---- tcl8.6.4.orig/pkgs/tdbcpostgres1.0.3/tclconfig/tcl.m4	2014-08-26 16:23:06.000000000 +0100
-+++ tcl8.6.4/pkgs/tdbcpostgres1.0.3/tclconfig/tcl.m4	2014-11-03 21:11:35.450615500 +0000
-@@ -3354,9 +3354,6 @@
+diff -Naur tcl8.6.5-orig/pkgs/tdbcpostgres1.0.4/tclconfig/tcl.m4 tcl8.6.5/pkgs/tdbcpostgres1.0.4/tclconfig/tcl.m4
+--- tcl8.6.5-orig/pkgs/tdbcpostgres1.0.4/tclconfig/tcl.m4	2016-03-01 04:59:34.000000000 +0300
++++ tcl8.6.5/pkgs/tdbcpostgres1.0.4/tclconfig/tcl.m4	2016-03-03 08:47:52.275056500 +0300
+@@ -3377,9 +3377,6 @@
  		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
  	    fi
  	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
@@ -102,10 +102,10 @@ diff -urN tcl8.6.4.orig/pkgs/tdbcpostgres1.0.3/tclconfig/tcl.m4 tcl8.6.4/pkgs/td
  	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
  	else
  	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
-diff -urN tcl8.6.4.orig/pkgs/tdbcsqlite3-1.0.3/tclconfig/tcl.m4 tcl8.6.4/pkgs/tdbcsqlite3-1.0.3/tclconfig/tcl.m4
---- tcl8.6.4.orig/pkgs/tdbcsqlite3-1.0.3/tclconfig/tcl.m4	2014-08-26 16:23:07.000000000 +0100
-+++ tcl8.6.4/pkgs/tdbcsqlite3-1.0.3/tclconfig/tcl.m4	2014-11-03 21:11:42.045452900 +0000
-@@ -3354,9 +3354,6 @@
+diff -Naur tcl8.6.5-orig/pkgs/tdbcsqlite3-1.0.4/tclconfig/tcl.m4 tcl8.6.5/pkgs/tdbcsqlite3-1.0.4/tclconfig/tcl.m4
+--- tcl8.6.5-orig/pkgs/tdbcsqlite3-1.0.4/tclconfig/tcl.m4	2016-03-01 04:59:34.000000000 +0300
++++ tcl8.6.5/pkgs/tdbcsqlite3-1.0.4/tclconfig/tcl.m4	2016-03-03 08:47:52.327051300 +0300
+@@ -3377,9 +3377,6 @@
  		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
  	    fi
  	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
@@ -115,10 +115,10 @@ diff -urN tcl8.6.4.orig/pkgs/tdbcsqlite3-1.0.3/tclconfig/tcl.m4 tcl8.6.4/pkgs/td
  	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
  	else
  	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
-diff -urN tcl8.6.4.orig/pkgs/thread2.7.2/tclconfig/tcl.m4 tcl8.6.4/pkgs/thread2.7.2/tclconfig/tcl.m4
---- tcl8.6.4.orig/pkgs/thread2.7.2/tclconfig/tcl.m4	2014-08-26 16:23:07.000000000 +0100
-+++ tcl8.6.4/pkgs/thread2.7.2/tclconfig/tcl.m4	2014-11-03 21:11:50.460521500 +0000
-@@ -3354,9 +3354,6 @@
+diff -Naur tcl8.6.5-orig/pkgs/thread2.7.3/tclconfig/tcl.m4 tcl8.6.5/pkgs/thread2.7.3/tclconfig/tcl.m4
+--- tcl8.6.5-orig/pkgs/thread2.7.3/tclconfig/tcl.m4	2016-03-01 04:59:34.000000000 +0300
++++ tcl8.6.5/pkgs/thread2.7.3/tclconfig/tcl.m4	2016-03-03 08:47:52.387045300 +0300
+@@ -3377,9 +3377,6 @@
  		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
  	    fi
  	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
@@ -128,9 +128,9 @@ diff -urN tcl8.6.4.orig/pkgs/thread2.7.2/tclconfig/tcl.m4 tcl8.6.4/pkgs/thread2.
  	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
  	else
  	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
-diff -urN tcl8.6.4.orig/win/tcl.m4 tcl8.6.4/win/tcl.m4
---- tcl8.6.4.orig/win/tcl.m4	2014-08-26 16:23:09.000000000 +0100
-+++ tcl8.6.4/win/tcl.m4	2014-11-03 21:12:59.195749700 +0000
+diff -Naur tcl8.6.5-orig/win/tcl.m4 tcl8.6.5/win/tcl.m4
+--- tcl8.6.5-orig/win/tcl.m4	2016-03-03 08:47:49.442339800 +0300
++++ tcl8.6.5/win/tcl.m4	2016-03-03 08:47:52.451038900 +0300
 @@ -635,7 +635,6 @@
  
      if test "${GCC}" = "yes" ; then
diff --git a/mingw-w64-tcl/PKGBUILD b/mingw-w64-tcl/PKGBUILD
index cdc0407c9f..67e509d13d 100644
--- a/mingw-w64-tcl/PKGBUILD
+++ b/mingw-w64-tcl/PKGBUILD
@@ -2,12 +2,14 @@
 # Contributor: Ray Donnelly <mingw.android@gmail.com>
 
 _realname=tcl
+pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=8.6.4
-pkgrel=2
+pkgver=8.6.5
+pkgrel=1
 pkgdesc="The Tcl scripting language (mingw-w64)"
 arch=('any')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-zlib")
+#conflicts=(${MINGW_PACKAGE_PREFIX}-sqlite-analyzer)
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
 options=('staticlibs') # '!strip' 'debug')
 license=("custom")
@@ -22,15 +24,15 @@ source=("https://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.
         009-fix-using-gnu-print.patch
         010-dont-link-shared-with--static-libgcc.patch)
 
-sha256sums=('9e6ed94c981c1d0c5f5fefb8112d06c6bf4d050a7327e95e71d417c416519c8d'
-            '2ff5e71516d115527ace0ecb37f51bd4956b11acd5e603249b98bec8da41726d'
-            '50f05d1cb482337c45cffa04898cc5595d97459cc9f864cddab24c9131202600'
-            '9ed179fdae259b774f6f2d4a0f1dd707050174a6b7c1d45c2e4c229e9a7412a2'
-            '59aa9644ef9c87e9d301f17611823af5e109e4daf3e613f87dfd8e7f00a218f1'
-            'ce0c7e3756af1331e8a8d4692caa54f5dc80fd665b2e8fb682f08c2ab42e786a'
-            'a809617939336a0068c5dd567f2c25489b2824ca25ad20f9cbf4e74c81396d2e'
-            '8d22bb4862cbdeff18ccf86a77407287ddd503ca1edeadbbd7f5b8a6c22a501f'
-            'ccd07a961ab2f9417df958b3f64b21f61fdaf109288f1e6ac68f2fb42dd09da1')
+sha256sums=('ce26d5b9c7504fc25d2f10ef0b82b14cf117315445b5afa9e673ed331830fb53'
+            '70bf0d8e84985f4e8ee63447ad37d5e50376eaf35ace51112761cacbbd596c4c'
+            '931485d71969096c1d03c8bed24fae3922d143fe50820d913e2567492ad6ac41'
+            '2b0f41f6704aa964dbfafa0a65dd5ce0ab97e82ff5cbbe2a95a2e8d644cc5550'
+            '5c0162fbb018c03b3e4b907bd0098ab5282314bc212e3929a0416126637e1350'
+            'f1833c3164229b017417d2ab2ce4cb066252fc1ad256de2313f0239481c7cc37'
+            '3ec2702efb1be6873d6ffd2ffb357637588f835f8817ae65cf0373020fcc7359'
+            '9c66ffe2de1d543f5291367d562ed5ee94e7e67345b281605788d7d9e02b8e7b'
+            '48189ed51cee25d9c634783baa8450fc51722435802076ec3e24600d739e179b')
 
 prepare() {
   cd "${srcdir}/tcl${pkgver}"
@@ -85,8 +87,8 @@ package() {
   local _libver=${pkgver%.*}
   _libver=${_libver//./}
 
-  local _odbc_ver=1.0.3
-  local _itcl_ver=4.0.3
+  local _odbc_ver=1.0.4
+  local _itcl_ver=4.0.4
   sed \
     -e "s|^\(TCL_BUILD_LIB_SPEC\)='.*|\1='-Wl,${MINGW_PREFIX}/lib/libtcl${_libver}.dll.a'|" \
     -e "s|^\(TCL_SRC_DIR\)='.*'|\1='${MINGW_PREFIX}/include/tcl${pkgver%.*}/tcl-private'|" \
@@ -132,4 +134,7 @@ package() {
   cp -rf ${pkgdir}${MINGW_PREFIX}/man ${pkgdir}${MINGW_PREFIX}/share/
   rm -rf ${pkgdir}${MINGW_PREFIX}/man
   install -Dm644 ${srcdir}/${_realname}${pkgver}/win/tcl.m4 ${pkgdir}${MINGW_PREFIX}/share/aclocal/tcl${pkgver%.*}.m4
+  
+  # Resolve conflict with sqlite-analyzer package
+  mv ${pkgdir}${MINGW_PREFIX}/bin/sqlite3_analyzer{,.sh}
 }
diff --git a/mingw-w64-tk/002-implib-name.mingw.patch b/mingw-w64-tk/002-implib-name.mingw.patch
index cb91e9f7bf..de42c877c4 100644
--- a/mingw-w64-tk/002-implib-name.mingw.patch
+++ b/mingw-w64-tk/002-implib-name.mingw.patch
@@ -1,5 +1,6 @@
---- tk8.6.1/win/configure.in.orig	2013-09-17 12:25:14.000000000 +0000
-+++ tk8.6.1/win/configure.in	2013-10-01 11:47:56.332043300 +0000
+diff -Naur tk8.6.5-orig/win/configure.in tk8.6.5/win/configure.in
+--- tk8.6.5-orig/win/configure.in	2016-02-29 22:13:21.000000000 +0300
++++ tk8.6.5/win/configure.in	2016-03-03 09:21:51.294037200 +0300
 @@ -166,7 +166,11 @@
  eval "TK_SRC_DIR=\"`cd $srcdir/..; pwd`\""
  
@@ -13,8 +14,9 @@
  
  eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${VER}${LIBSUFFIX}"
  # FIXME: All of this var junk needs to be done in tcl.m4 !!!!
---- tk8.6.1/win/Makefile.in.orig	2013-10-01 11:46:13.842028800 +0000
-+++ tk8.6.1/win/Makefile.in	2013-10-01 11:49:48.961845500 +0000
+diff -Naur tk8.6.5-orig/win/Makefile.in tk8.6.5/win/Makefile.in
+--- tk8.6.5-orig/win/Makefile.in	2016-02-29 22:13:21.000000000 +0300
++++ tk8.6.5/win/Makefile.in	2016-03-03 09:21:51.324037200 +0300
 @@ -135,7 +135,7 @@
  TK_LIB_FILE		= @TK_LIB_FILE@
  TK_DLL_FILE		= @TK_DLL_FILE@
@@ -24,10 +26,11 @@
  
  SHARED_LIBRARIES 	= $(TK_DLL_FILE) $(TK_STUB_LIB_FILE)
  STATIC_LIBRARIES	= $(TK_LIB_FILE)
---- tk8.6.1/win/tcl.m4.orig	2013-09-17 12:25:14.000000000 +0000
-+++ tk8.6.1/win/tcl.m4	2013-10-01 11:48:29.994818000 +0000
+diff -Naur tk8.6.5-orig/win/tcl.m4 tk8.6.5/win/tcl.m4
+--- tk8.6.5-orig/win/tcl.m4	2016-02-29 22:13:21.000000000 +0300
++++ tk8.6.5/win/tcl.m4	2016-03-03 09:21:51.337037200 +0300
 @@ -715,7 +715,7 @@
- 	SHLIB_LD='${CC} -shared ${CFLAGS}'
+ 	SHLIB_LD='${CC} -shared'
  	SHLIB_LD_LIBS='${LIBS}'
  	MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -o \[$]@ ${extra_ldflags} \
 -	    -Wl,--out-implib,\$(patsubst %.dll,lib%.a,\[$]@)"
diff --git a/mingw-w64-tk/003-fix-forbidden-colon-in-paths.mingw.patch b/mingw-w64-tk/003-fix-forbidden-colon-in-paths.mingw.patch
index 373d64b977..b2d7167c02 100644
--- a/mingw-w64-tk/003-fix-forbidden-colon-in-paths.mingw.patch
+++ b/mingw-w64-tk/003-fix-forbidden-colon-in-paths.mingw.patch
@@ -1,6 +1,7 @@
---- tk8.5.9.orig/unix/installManPage	2010-09-08 21:40:48 +0400
-+++ tk8.5.9/unix/installManPage	2011-03-24 20:34:35 +0300
-@@ -102,7 +102,7 @@
+diff -Naur tk8.6.5-orig/unix/installManPage tk8.6.5/unix/installManPage
+--- tk8.6.5-orig/unix/installManPage	2016-02-29 22:13:21.000000000 +0300
++++ tk8.6.5/unix/installManPage	2016-03-03 09:21:52.517037200 +0300
+@@ -103,7 +103,7 @@
      Target=$Target.$Section$Suffix
      rm -f $Dir/$Target $Dir/$Target.*
      if test -z "$First" ; then
diff --git a/mingw-w64-tk/004-install-man.mingw.patch b/mingw-w64-tk/004-install-man.mingw.patch
index 6395eaa089..6a2410bd90 100644
--- a/mingw-w64-tk/004-install-man.mingw.patch
+++ b/mingw-w64-tk/004-install-man.mingw.patch
@@ -1,7 +1,7 @@
-diff -ur tcl8.5.9.orig/win/Makefile.in tcl8.5.9/win/Makefile.in
---- tcl8.5.9.orig/win/Makefile.in	2010-09-08 21:40:49 +0400
-+++ tcl8.5.9/win/Makefile.in	2011-03-24 19:04:31 +0300
-@@ -575,6 +575,27 @@
+diff -Naur tk8.6.5-orig/win/Makefile.in tk8.6.5/win/Makefile.in
+--- tk8.6.5-orig/win/Makefile.in	2016-03-03 09:21:52.427037200 +0300
++++ tk8.6.5/win/Makefile.in	2016-03-03 09:21:52.896037200 +0300
+@@ -590,6 +590,27 @@
  	    done;
  
  install-doc: doc
diff --git a/mingw-w64-tk/006-prevent-tclStubsPtr-segfault.patch b/mingw-w64-tk/006-prevent-tclStubsPtr-segfault.patch
index f5aa8c4a3d..565be39414 100644
--- a/mingw-w64-tk/006-prevent-tclStubsPtr-segfault.patch
+++ b/mingw-w64-tk/006-prevent-tclStubsPtr-segfault.patch
@@ -1,9 +1,9 @@
-diff -urN a/generic/tkEvent.c b/generic/tkEvent.c
---- a/generic/tkEvent.c	2013-09-03 13:52:34.000000000 +0100
-+++ b/generic/tkEvent.c	2013-10-03 23:14:31.623094600 +0100
-@@ -2039,7 +2039,16 @@
- {
-     ExitHandler *exitPtr;
+diff -Naur tk8.6.5-orig/generic/tkEvent.c tk8.6.5/generic/tkEvent.c
+--- tk8.6.5-orig/generic/tkEvent.c	2016-02-16 21:21:01.000000000 +0300
++++ tk8.6.5/generic/tkEvent.c	2016-03-03 09:21:53.281037200 +0300
+@@ -2045,7 +2045,16 @@
+     }
+ #endif
  
 -    Tcl_DeleteExitHandler(TkFinalize, NULL);
 +    /* There's no guarantee that Tcl_InitStubs
diff --git a/mingw-w64-tk/007-mingw-w64-compatibility-fix.patch b/mingw-w64-tk/007-mingw-w64-compatibility-fix.patch
index e482c1aa17..24217715af 100644
--- a/mingw-w64-tk/007-mingw-w64-compatibility-fix.patch
+++ b/mingw-w64-tk/007-mingw-w64-compatibility-fix.patch
@@ -1,5 +1,6 @@
---- tk8.5.13/win/tkWin32Dll.c.orig	2013-09-12 07:16:01.344315269 +0200
-+++ tk8.5.13/win/tkWin32Dll.c	2013-09-12 07:20:35.909303786 +0200
+diff -Naur tk8.6.5-orig/win/tkWin32Dll.c tk8.6.5/win/tkWin32Dll.c
+--- tk8.6.5-orig/win/tkWin32Dll.c	2014-02-10 23:03:05.000000000 +0400
++++ tk8.6.5/win/tkWin32Dll.c	2016-03-03 09:21:53.742037200 +0300
 @@ -12,7 +12,7 @@
  #include "tkWinInt.h"
  #ifndef STATIC_BUILD
diff --git a/mingw-w64-tk/008-dont-link-shared-with--static-libgcc.patch b/mingw-w64-tk/008-dont-link-shared-with--static-libgcc.patch
index d00129c663..1640ab16e8 100644
--- a/mingw-w64-tk/008-dont-link-shared-with--static-libgcc.patch
+++ b/mingw-w64-tk/008-dont-link-shared-with--static-libgcc.patch
@@ -1,6 +1,6 @@
-diff -urN tk8.6.2.orig/win/tcl.m4 tk8.6.2/win/tcl.m4
---- tk8.6.2.orig/win/tcl.m4	2014-11-03 22:23:18.826074700 +0000
-+++ tk8.6.2/win/tcl.m4	2014-11-03 22:24:21.781569100 +0000
+diff -Naur tk8.6.5-orig/win/tcl.m4 tk8.6.5/win/tcl.m4
+--- tk8.6.5-orig/win/tcl.m4	2016-03-03 09:21:52.442037200 +0300
++++ tk8.6.5/win/tcl.m4	2016-03-03 09:21:54.114037200 +0300
 @@ -635,7 +635,6 @@
  
      if test "${GCC}" = "yes" ; then
diff --git a/mingw-w64-tk/PKGBUILD b/mingw-w64-tk/PKGBUILD
index 1109d8ada0..8e961c58b7 100644
--- a/mingw-w64-tk/PKGBUILD
+++ b/mingw-w64-tk/PKGBUILD
@@ -2,9 +2,10 @@
 # Contributor: Ray Donnelly <mingw.android@gmail.com>
 
 _realname=tk
+pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=8.6.4
-pkgrel=2
+pkgver=8.6.5
+pkgrel=1
 pkgdesc="A windowing toolkit for use with tcl (mingw-w64)"
 arch=('any')
 url="http://tcl.sourceforge.net"
@@ -18,12 +19,12 @@ source=("https://downloads.sourceforge.net/sourceforge/tcl/${_realname}${pkgver}
         004-install-man.mingw.patch
         006-prevent-tclStubsPtr-segfault.patch
         008-dont-link-shared-with--static-libgcc.patch)
-sha256sums=('08f99df85e5dc9c4271762163c6aabb962c8b297dc5c4c1af8bdd05fc2dd26c1'
-            'c75ea5575163cb593a19511e286466e2195b848d2b756c169a7a6e70d9f6978c'
-            'f2d63e6ea7474798162e425efffd748d832eb2c211e36b6dc3a562fde0772dec'
-            'b15080708f1c7349a8ff2f182b52e9c2f39264448594fe41f691a9bc058e2098'
-            '9959768441525f08948d7a190251411d8ff78d036893fce34aff3d942a45ac6e'
-            '22480c8070e04299ffce7759819865fd079dd9c3ac451d5d8f9f877b8f92d98b')
+sha256sums=('fbbd93541b4cd467841208643b4014c4543a54c3597586727f0ab128220d7946'
+            '441f2f5bdf1ee2bf6697569365207d554130bd5a2bac01e10a6e1a37738d8006'
+            '5347487af0e736dbb51425b22ed308840faf75b44c070623baa55f78dac3d053'
+            '8516749dd73c084ece7b9df6d1ba5708e652e8ba39cad59120c7f909f61747f0'
+            '0029fde6782ce7635e9957412d3e36a7e76d304399d57d64a42818f93e705621'
+            'a16406e8519ab681bba0915e35b23a7f91cf978934b0a4ebdc7e949e87f0c877')
 
 prepare() {
   cd "${srcdir}/${_realname}${pkgver}"