diff --git a/lang/tcl/8.6/Makefile b/lang/tcl/8.6/Makefile
index 423daa1e47e..1e26662d458 100644
--- a/lang/tcl/8.6/Makefile
+++ b/lang/tcl/8.6/Makefile
@@ -1,6 +1,6 @@
 COMMENT =		Tool Command Language
 
-P =			12
+P =			13
 DISTNAME =		tcl8.6.${P}
 PKGNAME =		tcl-8.6.${P}
 PKGSTEM = 		tcl-8.6
@@ -44,15 +44,13 @@ ALL_TARGET =		binaries
 TEST_TARGET =		test-tcl
 
 TESTHOME =		${WRKDIR}/testhome
+
 # Use TESTFLAGS to control the Tcl tests
 TESTFLAGS =
 
-# These tests will always fail due to assumptions that don't hold on OpenBSD.
-# Skip them until they're improved.
-# fCmd-9.4.b expects to be able to overwrite a read-only directory.
-# Many socket-14.* expect certain socket errors to occur
-#   later rather than sooner. Bug 2911139.
-TESTFLAGS += -skip 'fCmd-9.4.b socket-14.*'
+# This test will always fail;
+# OpenBSD won't allow overwriting a read-only directory.
+TESTFLAGS += -skip 'fCmd-9.4.b'
 
 pre-configure:
 	@${SUBST_CMD} ${WRKDIST}/library/init.tcl
diff --git a/lang/tcl/8.6/distinfo b/lang/tcl/8.6/distinfo
index fe57eca7efe..e9fd8234a58 100644
--- a/lang/tcl/8.6/distinfo
+++ b/lang/tcl/8.6/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tcl-core8.6.12-src.tar.gz) = GGdI8RMc7z1jdCGhjXCJL4COUmopxpS+v+scVA+Ycnw=
-SIZE (tcl-core8.6.12-src.tar.gz) = 6064625
+SHA256 (tcl-core8.6.13-src.tar.gz) = xh8NZpnivHaR8Rm0GWOqqNyYDyNTLE6TdzmDKl9KZkI=
+SIZE (tcl-core8.6.13-src.tar.gz) = 6370805
diff --git a/lang/tcl/8.6/patches/patch-unix_Makefile_in b/lang/tcl/8.6/patches/patch-unix_Makefile_in
index b95262ffbc5..e64af792986 100644
--- a/lang/tcl/8.6/patches/patch-unix_Makefile_in
+++ b/lang/tcl/8.6/patches/patch-unix_Makefile_in
@@ -1,7 +1,7 @@
 Index: unix/Makefile.in
 --- unix/Makefile.in.orig
 +++ unix/Makefile.in
-@@ -893,7 +893,6 @@ install-binaries: binaries
+@@ -900,7 +900,6 @@ install-binaries: binaries
  	done
  	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
  	@@INSTALL_LIB@
@@ -9,7 +9,7 @@ Index: unix/Makefile.in
  	@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
  	@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
  	@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
-@@ -908,7 +907,7 @@ install-binaries: binaries
+@@ -915,7 +914,7 @@ install-binaries: binaries
  	@EXTRA_INSTALL_BINARIES@
  	@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
  	@$(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/pkgconfig"
@@ -18,16 +18,16 @@ Index: unix/Makefile.in
  
  install-libraries: libraries
  	@for i in "$(SCRIPT_INSTALL_DIR)" "$(MODULE_INSTALL_DIR)"; \
-@@ -919,7 +918,7 @@ install-libraries: libraries
- 		else true; \
- 		fi; \
+@@ -925,7 +924,7 @@ install-libraries: libraries
+ 		$(INSTALL_DATA_DIR) "$$i"; \
+ 	    fi; \
  	    done;
 -	@for i in opt0.4 http1.0 encoding; \
 +	@for i in opt0.4 http1.0 encoding ../modules/85 ../modules/86; \
  	    do \
  	    if [ ! -d "$(SCRIPT_INSTALL_DIR)/$$i" ] ; then \
  		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
-@@ -927,7 +926,7 @@ install-libraries: libraries
+@@ -933,7 +932,7 @@ install-libraries: libraries
  		else true; \
  		fi; \
  	    done;
@@ -36,13 +36,13 @@ Index: unix/Makefile.in
  	    do \
  	    if [ ! -d "$(MODULE_INSTALL_DIR)/$$i" ] ; then \
  		echo "Making directory $(MODULE_INSTALL_DIR)/$$i"; \
-@@ -947,23 +946,23 @@ install-libraries: libraries
- 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/http1.0"; \
+@@ -952,23 +951,23 @@ install-libraries: libraries
  	    done
- 	@echo "Installing package http 2.9.5 as a Tcl Module";
--	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(MODULE_INSTALL_DIR)/8.6/http-2.9.5.tm"
-+	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(MODULE_INSTALL_DIR)/http-2.9.5.tm"
- 	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
+ 	@echo "Installing package http 2.9.8 as a Tcl Module";
+ 	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl \
+-		"$(MODULE_INSTALL_DIR)/8.6/http-2.9.8.tm"
++		"$(MODULE_INSTALL_DIR)/http-2.9.8.tm"
+ 	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"
  	@for i in $(TOP_DIR)/library/opt/*.tcl; do \
  	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/opt0.4"; \
  	done
@@ -50,14 +50,14 @@ Index: unix/Makefile.in
  	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl \
 -		"$(MODULE_INSTALL_DIR)/8.5/msgcat-1.6.1.tm"
 +		"$(MODULE_INSTALL_DIR)/msgcat-1.6.1.tm"
- 	@echo "Installing package tcltest 2.5.3 as a Tcl Module"
+ 	@echo "Installing package tcltest 2.5.5 as a Tcl Module"
  	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl \
--		"$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.3.tm"
-+		"$(MODULE_INSTALL_DIR)/tcltest-2.5.3.tm"
- 	@echo "Installing package platform 1.0.18 as a Tcl Module"
+-		"$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.5.tm"
++		"$(MODULE_INSTALL_DIR)/tcltest-2.5.5.tm"
+ 	@echo "Installing package platform 1.0.19 as a Tcl Module"
  	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl \
--		"$(MODULE_INSTALL_DIR)/8.4/platform-1.0.18.tm"
-+		"$(MODULE_INSTALL_DIR)/platform-1.0.18.tm"
+-		"$(MODULE_INSTALL_DIR)/8.4/platform-1.0.19.tm"
++		"$(MODULE_INSTALL_DIR)/platform-1.0.19.tm"
  	@echo "Installing package platform::shell 1.1.4 as a Tcl Module"
  	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl \
 -		"$(MODULE_INSTALL_DIR)/8.4/platform/shell-1.1.4.tm"
@@ -65,7 +65,7 @@ Index: unix/Makefile.in
  	@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"
  	@for i in $(TOP_DIR)/library/encoding/*.enc; do \
  		$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/encoding"; \
-@@ -1037,6 +1036,8 @@ install-doc: doc
+@@ -1042,6 +1041,8 @@ install-doc: doc
  	@for i in $(TOP_DIR)/doc/*.n; do \
  	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
  	done
diff --git a/lang/tcl/8.6/pkg/PLIST b/lang/tcl/8.6/pkg/PLIST
index 5083ab449aa..ae45fbc902a 100644
--- a/lang/tcl/8.6/pkg/PLIST
+++ b/lang/tcl/8.6/pkg/PLIST
@@ -936,12 +936,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/http-2.9.5.tm
+lib/tcl/tcl8.6/modules/http-2.9.8.tm
 lib/tcl/tcl8.6/modules/msgcat-1.6.1.tm
 lib/tcl/tcl8.6/modules/platform/
-lib/tcl/tcl8.6/modules/platform-1.0.18.tm
+lib/tcl/tcl8.6/modules/platform-1.0.19.tm
 lib/tcl/tcl8.6/modules/platform/shell-1.1.4.tm
-lib/tcl/tcl8.6/modules/tcltest-2.5.3.tm
+lib/tcl/tcl8.6/modules/tcltest-2.5.5.tm
 lib/tcl/tcl8.6/msgs/
 lib/tcl/tcl8.6/msgs/af.msg
 lib/tcl/tcl8.6/msgs/af_za.msg