diff --git a/devel/tcllib/Makefile b/devel/tcllib/Makefile
index e90a951637ad..d62486fa94c9 100644
--- a/devel/tcllib/Makefile
+++ b/devel/tcllib/Makefile
@@ -18,8 +18,7 @@ OPTIONS_DEFINE=	DOCS MANPAGES
 USE_GITHUB=	yes
 GH_ACCOUNT=	tcltk
 GH_PROJECT=	tcllib
-GH_TAGNAME=	tcllib_${PORTVERSION:S/./_/}
-GH_COMMIT=	ce4a0e4
+GH_COMMIT=	8c846ec
 
 USES+=		tcl
 GNU_CONFIGURE=	yes
@@ -81,20 +80,22 @@ post-patch:
 #	man pages have the .tcllib suffix, so there's no need to have a
 #	tcllib_ prefix too
 #
-	for man in `${FIND} ${WRKSRC} -name "tcllib_*.man"`; do \
+	cd ${WRKSRC} && \
+	for man in `${FIND} . -name "tcllib_*.man"`; do \
 	    ${MV} $$man `echo $$man | ${SED} -e 's|tcllib_||'`; \
-	done
-	for man in `${FIND} ${WRKSRC} -name "tcllib_*.n"`; do \
+	done && \
+	for man in `${FIND} . -name "tcllib_*.n"`; do \
 	    ${MV} $$man `echo $$man | ${SED} -e 's|tcllib_||'`; \
 	done
 
 #
 #	add the .tcllib suffix to man pages
 #
-	for man in `${FIND} ${WRKSRC} -name "*.man"`; do \
+	cd ${WRKSRC} && \
+	for man in `${FIND} . -name "*.man"`; do \
 	    ${MV} $$man `echo $$man | ${SED} -e 's|man$$|tcllib.man|'`; \
-	done
-	for man in `${FIND} ${WRKSRC} -name "*.n"`; do \
+	done && \
+	for man in `${FIND} . -name "*.n"`; do \
 	    ${MV} $$man `echo $$man | ${SED} -e 's|n$$|tcllib.n|'`; \
 	done
 
diff --git a/devel/tcllib/distinfo b/devel/tcllib/distinfo
index 96e9eadedc1b..4c5096e730a7 100644
--- a/devel/tcllib/distinfo
+++ b/devel/tcllib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tcllib-1.16.tar.gz) = a188b2fd37d0a05de7fd0794bf477c5be846de444c142457ad7adc8972e7b488
-SIZE (tcllib-1.16.tar.gz) = 7698126
+SHA256 (tcllib-1.16.tar.gz) = 3e8a1339749ceb05d8f0f8d36b16713c5fba2a885ae05adce763cda1d217b5e1
+SIZE (tcllib-1.16.tar.gz) = 7790599
diff --git a/devel/tcllib/pkg-plist b/devel/tcllib/pkg-plist
index dc560b519a11..9ab55dd5f5c1 100644
--- a/devel/tcllib/pkg-plist
+++ b/devel/tcllib/pkg-plist
@@ -690,6 +690,7 @@ lib/tcllib/zip/pkgIndex.tcl
 %%MAN%%man/mann/comm_wire.tcllib.n.gz
 %%MAN%%man/mann/connect.tcllib.n.gz
 %%MAN%%man/mann/constants.tcllib.n.gz
+%%MAN%%man/mann/container.tcllib.n.gz
 %%MAN%%man/mann/control.tcllib.n.gz
 %%MAN%%man/mann/copyops.tcllib.n.gz
 %%MAN%%man/mann/core.tcllib.n.gz
@@ -743,8 +744,14 @@ lib/tcllib/zip/pkgIndex.tcl
 %%MAN%%man/mann/encode.tcllib.n.gz
 %%MAN%%man/mann/events.tcllib.n.gz
 %%MAN%%man/mann/expander.tcllib.n.gz
+%%MAN%%man/mann/export.tcllib.n.gz
 %%MAN%%man/mann/export_docidx.tcllib.n.gz
 %%MAN%%man/mann/export_doctoc.tcllib.n.gz
+%%MAN%%man/mann/export_html.tcllib.n.gz
+%%MAN%%man/mann/export_json.tcllib.n.gz
+%%MAN%%man/mann/export_nroff.tcllib.n.gz
+%%MAN%%man/mann/export_text.tcllib.n.gz
+%%MAN%%man/mann/export_wiki.tcllib.n.gz
 %%MAN%%man/mann/fa.tcllib.n.gz
 %%MAN%%man/mann/facade.tcllib.n.gz
 %%MAN%%man/mann/faop.tcllib.n.gz
@@ -793,11 +800,14 @@ lib/tcllib/zip/pkgIndex.tcl
 %%MAN%%man/mann/imap4.tcllib.n.gz
 %%MAN%%man/mann/imei.tcllib.n.gz
 %%MAN%%man/mann/imenu.tcllib.n.gz
+%%MAN%%man/mann/import.tcllib.n.gz
 %%MAN%%man/mann/import_docidx.tcllib.n.gz
 %%MAN%%man/mann/import_doctoc.tcllib.n.gz
+%%MAN%%man/mann/import_json.tcllib.n.gz
 %%MAN%%man/mann/ini.tcllib.n.gz
 %%MAN%%man/mann/interp.tcllib.n.gz
 %%MAN%%man/mann/interpolate.tcllib.n.gz
+%%MAN%%man/mann/introduction.tcllib.n.gz
 %%MAN%%man/mann/ip.tcllib.n.gz
 %%MAN%%man/mann/ipager.tcllib.n.gz
 %%MAN%%man/mann/irc.tcllib.n.gz
@@ -844,6 +854,10 @@ lib/tcllib/zip/pkgIndex.tcl
 %%MAN%%man/mann/montecarlo.tcllib.n.gz
 %%MAN%%man/mann/mpexpand.tcllib.n.gz
 %%MAN%%man/mann/msgcat.tcllib.n.gz
+%%MAN%%man/mann/msgcat_c.tcllib.n.gz
+%%MAN%%man/mann/msgcat_de.tcllib.n.gz
+%%MAN%%man/mann/msgcat_en.tcllib.n.gz
+%%MAN%%man/mann/msgcat_fr.tcllib.n.gz
 %%MAN%%man/mann/multi.tcllib.n.gz
 %%MAN%%man/mann/multiop.tcllib.n.gz
 %%MAN%%man/mann/multiplexer.tcllib.n.gz
@@ -878,6 +892,7 @@ lib/tcllib/zip/pkgIndex.tcl
 %%MAN%%man/mann/page_util_norm_peg.tcllib.n.gz
 %%MAN%%man/mann/page_util_peg.tcllib.n.gz
 %%MAN%%man/mann/page_util_quote.tcllib.n.gz
+%%MAN%%man/mann/parse.tcllib.n.gz
 %%MAN%%man/mann/peg.tcllib.n.gz
 %%MAN%%man/mann/peg_interp.tcllib.n.gz
 %%MAN%%man/mann/picoirc.tcllib.n.gz
@@ -977,6 +992,7 @@ lib/tcllib/zip/pkgIndex.tcl
 %%MAN%%man/mann/struct_set.tcllib.n.gz
 %%MAN%%man/mann/struct_tree.tcllib.n.gz
 %%MAN%%man/mann/struct_tree1.tcllib.n.gz
+%%MAN%%man/mann/structure.tcllib.n.gz
 %%MAN%%man/mann/sum.tcllib.n.gz
 %%MAN%%man/mann/switched.tcllib.n.gz
 %%MAN%%man/mann/symdiff.tcllib.n.gz