diff --git a/devel/universal-ctags/Makefile b/devel/universal-ctags/Makefile
index e03a2ebaabcd..4406b9348b4f 100644
--- a/devel/universal-ctags/Makefile
+++ b/devel/universal-ctags/Makefile
@@ -1,45 +1,45 @@
 # Created by: Derek Schrock <dereks@lifeofadishwasher.com>
 
 PORTNAME=	universal-ctags
-PORTVERSION=	p5.9.20210815.0
+PORTVERSION=	p5.9.20210926.0
 CATEGORIES=	devel
 
 MAINTAINER=	dereks@lifeofadishwasher.com
 COMMENT=	Fork of Exuberant Ctags to generate index/tag files
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		autoreconf gmake pkgconfig
 USE_GITHUB=	yes
 GH_PROJECT=	ctags
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=u
 
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=		DEBUG ICONV JSON LIBXML2 MANPAGES YAML
 OPTIONS_DEFAULT=	ICONV JSON LIBXML2 MANPAGES YAML
 OPTIONS_SUB=		yes
 
 JSON_DESC=	JSON output support
 
 DEBUG_CONFIGURE_ENABLE=	debugging
 
 ICONV_USES=		iconv
 ICONV_CONFIGURE_ENABLE=	iconv
 
 # Extra support for YAML and XML based languages
 JSON_LIB_DEPENDS=	libjansson.so:devel/jansson
 JSON_CONFIGURE_ENABLE=	json
 
 LIBXML2_LIB_DEPENDS=		libxml2.so:textproc/libxml2
 LIBXML2_CONFIGURE_ENABLE=	xml
 
 MANPAGES_BUILD_DEPENDS=	rst2man:textproc/py-docutils
 
 YAML_LIB_DEPENDS=	libyaml.so:textproc/libyaml
 YAML_CONFIGURE_ENABLE=	yaml
 
 .include <bsd.port.mk>
diff --git a/devel/universal-ctags/distinfo b/devel/universal-ctags/distinfo
index 475843761a1c..07b0d4d21575 100644
--- a/devel/universal-ctags/distinfo
+++ b/devel/universal-ctags/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628987862
-SHA256 (universal-ctags-ctags-p5.9.20210815.0_GH0.tar.gz) = a56de2c39090bbe1baa1fc7fcdb50834503f8b2b02edf304d7ab61c76ad82c0d
-SIZE (universal-ctags-ctags-p5.9.20210815.0_GH0.tar.gz) = 2532710
+TIMESTAMP = 1632630353
+SHA256 (universal-ctags-ctags-p5.9.20210926.0_GH0.tar.gz) = 87a19089fe1cf16b4780a24a6ab4e847280182ffba95ab3db76a0ddc0a7b170d
+SIZE (universal-ctags-ctags-p5.9.20210926.0_GH0.tar.gz) = 2541906
diff --git a/devel/universal-ctags/files/patch-makefiles_testing.mak b/devel/universal-ctags/files/patch-makefiles_testing.mak
new file mode 100644
index 000000000000..d4f1cf74281d
--- /dev/null
+++ b/devel/universal-ctags/files/patch-makefiles_testing.mak
@@ -0,0 +1,11 @@
+--- makefiles/testing.mak.orig	2021-09-26 04:43:19 UTC
++++ makefiles/testing.mak
+@@ -5,7 +5,7 @@ EXTRA_DIST += misc/units misc/units.py misc/man-test.p
+ EXTRA_DIST += misc/tlib misc/mini-geany.expected
+ MAN_TEST_TMPDIR = ManTest
+ 
+-check: tmain units tlib man-test check-genfile
++check: tmain units tlib man-test
+ 
+ # We may use CLEANFILES, DISTCLEANFILES, or etc.
+ # clean-tlib and clean-gcov are not included
diff --git a/devel/universal-ctags/pkg-plist b/devel/universal-ctags/pkg-plist
index 86ce250c8841..7dfd8ae64d45 100644
--- a/devel/universal-ctags/pkg-plist
+++ b/devel/universal-ctags/pkg-plist
@@ -1,17 +1,18 @@
 bin/uctags
 bin/ureadtags
 bin/uoptscript
 %%MANPAGES%%man/man1/uctags.1.gz
 %%MANPAGES%%man/man1/ureadtags.1.gz
 %%MANPAGES%%man/man5/utags.5.gz
 %%MANPAGES%%man/man7/uctags-client-tools.7.gz
 %%MANPAGES%%man/man7/uctags-faq.7.gz
 %%MANPAGES%%man/man7/uctags-incompatibilities.7.gz
 %%MANPAGES%%man/man7/uctags-lang-iPythonCell.7.gz
 %%MANPAGES%%man/man7/uctags-lang-inko.7.gz
 %%MANPAGES%%man/man7/uctags-lang-julia.7.gz
 %%MANPAGES%%man/man7/uctags-lang-python.7.gz
 %%MANPAGES%%man/man7/uctags-lang-r.7.gz
 %%MANPAGES%%man/man7/uctags-lang-sql.7.gz
+%%MANPAGES%%man/man7/uctags-lang-tcl.7.gz
 %%MANPAGES%%man/man7/uctags-lang-verilog.7.gz
 %%MANPAGES%%man/man7/uctags-optlib.7.gz