diff --git a/lang/tcl/8.6/Makefile b/lang/tcl/8.6/Makefile
index d036387d482..ddc639a8aba 100644
--- a/lang/tcl/8.6/Makefile
+++ b/lang/tcl/8.6/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2014/09/07 18:49:13 stu Exp $
+# $OpenBSD: Makefile,v 1.12 2014/10/21 05:08:53 stu Exp $
 
 COMMENT =		Tool Command Language
 
 DISTNAME =		tcl8.6.2
 PKGNAME =		tcl-8.6.2
+REVISION =		0
 SHARED_LIBS =		tcl86 1.1
 CATEGORIES =		lang lang/tcl
 HOMEPAGE =		http://www.tcl.tk/
diff --git a/lang/tcl/8.6/patches/patch-library_tm_tcl b/lang/tcl/8.6/patches/patch-library_tm_tcl
index c2bc4f9626e..5f77d5af2a4 100644
--- a/lang/tcl/8.6/patches/patch-library_tm_tcl
+++ b/lang/tcl/8.6/patches/patch-library_tm_tcl
@@ -1,7 +1,7 @@
-$OpenBSD: patch-library_tm_tcl,v 1.2 2013/09/22 10:33:13 stu Exp $
---- library/tm.tcl.orig	Tue Sep 17 08:14:11 2013
-+++ library/tm.tcl	Tue Sep 17 20:54:45 2013
-@@ -316,10 +316,13 @@ proc ::tcl::tm::Defaults {} {
+$OpenBSD: patch-library_tm_tcl,v 1.3 2014/10/21 05:08:53 stu Exp $
+--- library/tm.tcl.orig	Mon Jul 28 10:43:55 2014
++++ library/tm.tcl	Sat Oct 11 14:16:12 2014
+@@ -316,10 +316,11 @@ proc ::tcl::tm::Defaults {} {
  
      # Note that we're using [::list], not [list] because [list] means
      # something other than [::list] in this namespace.
@@ -11,11 +11,9 @@ $OpenBSD: patch-library_tm_tcl,v 1.2 2013/09/22 10:33:13 stu Exp $
 -	    ]
 +
 +    # OpenBSD layout
-+    foreach dir [::list [info library] [file dirname [info library]]] {
-+	foreach ver [::list [info tclversion] 8.5] {
-+	    add [file join $dir modules $ver]
-+	}
-+    }
++    add [file join [info library] modules] \
++	[file join [lindex $::tcl_pkgPath 0] modules 86] \
++	[file join [lindex $::tcl_pkgPath 0] modules 85]
  
      if {$tcl_platform(platform) eq "windows"} {
  	set sep ";"
diff --git a/lang/tcl/8.6/patches/patch-unix_Makefile_in b/lang/tcl/8.6/patches/patch-unix_Makefile_in
index 9ffa70b3281..f2f0d7dde71 100644
--- a/lang/tcl/8.6/patches/patch-unix_Makefile_in
+++ b/lang/tcl/8.6/patches/patch-unix_Makefile_in
@@ -1,4 +1,4 @@
-$OpenBSD: patch-unix_Makefile_in,v 1.3 2014/09/07 18:49:13 stu Exp $
+$OpenBSD: patch-unix_Makefile_in,v 1.4 2014/10/21 05:08:53 stu Exp $
 --- unix/Makefile.in.orig	Mon Jul 28 11:58:05 2014
 +++ unix/Makefile.in	Sat Aug 16 18:21:09 2014
 @@ -632,6 +632,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
@@ -34,7 +34,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.3 2014/09/07 18:49:13 stu Exp $
  		fi; \
  	    done;
 -	@for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4  ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \
-+	@for i in opt0.4 http1.0 encoding modules/8.5/platform modules/8.6 ../modules/8.5 ../modules/8.6; \
++	@for i in opt0.4 http1.0 encoding modules modules/platform ../modules/85 ../modules/86; \
  	    do \
  	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
  		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -43,7 +43,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.3 2014/09/07 18:49:13 stu Exp $
  	    done;
  	@echo "Installing package http 2.8.8 as a Tcl Module";
 -	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.8.tm;
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.6/http-2.8.8.tm;
++	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/modules/http-2.8.8.tm;
  	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
  	@for i in $(TOP_DIR)/library/opt/*.tcl ; \
  	    do \
@@ -51,17 +51,17 @@ $OpenBSD: patch-unix_Makefile_in,v 1.3 2014/09/07 18:49:13 stu Exp $
  	    done;
  	@echo "Installing package msgcat 1.5.2 as a Tcl Module";
 -	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.2.tm;
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/msgcat-1.5.2.tm;
++	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/modules/msgcat-1.5.2.tm;
  	@echo "Installing package tcltest 2.3.8 as a Tcl Module";
 -	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.8.tm;
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/tcltest-2.3.8.tm;
++	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/modules/tcltest-2.3.8.tm;
  
  	@echo "Installing package platform 1.0.13 as a Tcl Module";
 -	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.13.tm;
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/platform-1.0.13.tm;
++	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/modules/platform-1.0.13.tm;
  	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
 -	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm;
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/platform/shell-1.1.4.tm;
++	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/modules/platform/shell-1.1.4.tm;
  
  	@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
  	@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
diff --git a/lang/tcl/8.6/pkg/PLIST b/lang/tcl/8.6/pkg/PLIST
index bf738a3a86a..6dacfebd7c4 100644
--- a/lang/tcl/8.6/pkg/PLIST
+++ b/lang/tcl/8.6/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2014/09/07 18:49:13 stu Exp $
+@comment $OpenBSD: PLIST,v 1.6 2014/10/21 05:08:53 stu Exp $
 @option no-default-conflict
 @conflict tcl->=8.6,<8.7
 %%SHARED%%
@@ -24,8 +24,8 @@ lib/libtclstub86.a
 lib/pkgconfig/tcl86.pc
 lib/tcl/
 lib/tcl/modules/
-lib/tcl/modules/8.5/
-lib/tcl/modules/8.6/
+lib/tcl/modules/85/
+lib/tcl/modules/86/
 lib/tcl/tcl8.6/
 lib/tcl/tcl8.6/auto.tcl
 lib/tcl/tcl8.6/clock.tcl
@@ -927,14 +927,12 @@ lib/tcl/tcl8.6/man/mann/
 @man lib/tcl/tcl8.6/man/mann/yieldto.n
 @man lib/tcl/tcl8.6/man/mann/zlib.n
 lib/tcl/tcl8.6/modules/
-lib/tcl/tcl8.6/modules/8.5/
-lib/tcl/tcl8.6/modules/8.5/msgcat-1.5.2.tm
-lib/tcl/tcl8.6/modules/8.5/platform/
-lib/tcl/tcl8.6/modules/8.5/platform-1.0.13.tm
-lib/tcl/tcl8.6/modules/8.5/platform/shell-1.1.4.tm
-lib/tcl/tcl8.6/modules/8.5/tcltest-2.3.8.tm
-lib/tcl/tcl8.6/modules/8.6/
-lib/tcl/tcl8.6/modules/8.6/http-2.8.8.tm
+lib/tcl/tcl8.6/modules/http-2.8.8.tm
+lib/tcl/tcl8.6/modules/msgcat-1.5.2.tm
+lib/tcl/tcl8.6/modules/platform/
+lib/tcl/tcl8.6/modules/platform-1.0.13.tm
+lib/tcl/tcl8.6/modules/platform/shell-1.1.4.tm
+lib/tcl/tcl8.6/modules/tcltest-2.3.8.tm
 lib/tcl/tcl8.6/msgs/
 lib/tcl/tcl8.6/msgs/af.msg
 lib/tcl/tcl8.6/msgs/af_za.msg