diff --git a/devel/universal-ctags/Makefile b/devel/universal-ctags/Makefile
index c4119111d106..826b3ee8ac20 100644
--- a/devel/universal-ctags/Makefile
+++ b/devel/universal-ctags/Makefile
@@ -1,57 +1,56 @@
 PORTNAME=	universal-ctags
-PORTVERSION=	p6.1.20240121.0
-PORTREVISION=	1
+PORTVERSION=	p6.1.20240211.0
 CATEGORIES=	devel
 
 MAINTAINER=	dereks@lifeofadishwasher.com
 COMMENT=	Fork of Exuberant Ctags to generate index/tag files
 WWW=		https://ctags.io/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		autoreconf gmake pkgconfig python:test
 USE_GITHUB=	yes
 GH_PROJECT=	ctags
 
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=			yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
-CONFIGURE_ARGS=	--program-prefix=u
+CONFIGURE_ARGS=			--program-prefix=u
 
 TEST_TARGET=	check
 
 PORTSCOUT=	limit:^p6
 
 OPTIONS_DEFINE=		DEBUG GLOBAL_CONFIG ICONV JSON LIBXML2 MANPAGES PCRE2 \
 			YAML
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE:NDEBUG:NGLOBAL_CONFIG}
 OPTIONS_SUB=		yes
 
 GLOBAL_CONFIG_DESC=	Enable reading global config from ${LOCALBASE}/etc/uctags.conf
 JSON_DESC=		JSON output support
 PCRE2_DESC=		${PCRE_DESC} v2
 
 DEBUG_CONFIGURE_ENABLE=	debugging
 
 GLOBAL_CONFIG_CONFIGURE_ENABLE=	custom-config="${LOCALBASE}/etc/uctags.conf"
 
 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
 MANPAGES_CONFIGURE_WITH=	rst2man=${LOCALBASE}/bin/rst2man
 
 PCRE2_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 PCRE2_CONFIGURE_ENABLE=	pcre2
 
 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 53a964199138..f6b0f8e7e323 100644
--- a/devel/universal-ctags/distinfo
+++ b/devel/universal-ctags/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1705814232
-SHA256 (universal-ctags-ctags-p6.1.20240121.0_GH0.tar.gz) = 88f523e6f90ff0cc5a7da6a65b3443d4c6205b515d945ae6e9dba1fa377fe12d
-SIZE (universal-ctags-ctags-p6.1.20240121.0_GH0.tar.gz) = 3131734
+TIMESTAMP = 1708199137
+SHA256 (universal-ctags-ctags-p6.1.20240211.0_GH0.tar.gz) = 63426af2d332179a5d9dc4cdcfe183ede74d4c5e87c6d8c56e7f32a72f053501
+SIZE (universal-ctags-ctags-p6.1.20240211.0_GH0.tar.gz) = 3136078
diff --git a/devel/universal-ctags/files/patch-makefiles_testing.mak b/devel/universal-ctags/files/patch-makefiles_testing.mak
deleted file mode 100644
index 339c2c91e2dc..000000000000
--- a/devel/universal-ctags/files/patch-makefiles_testing.mak
+++ /dev/null
@@ -1,11 +0,0 @@
---- makefiles/testing.mak.orig	2022-10-23 20:50:28 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 tutil
-+check: tmain units tlib man-test tutil
- 
- # 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 0ef34bde37b4..a7b638228523 100644
--- a/devel/universal-ctags/pkg-plist
+++ b/devel/universal-ctags/pkg-plist
@@ -1,36 +1,37 @@
 bin/uctags
 bin/uoptscript
 bin/ureadtags
 %%MANPAGES%%share/man/man1/uctags.1.gz
 %%MANPAGES%%share/man/man1/ureadtags.1.gz
 %%MANPAGES%%share/man/man5/uctags-json-output.5.gz
 %%MANPAGES%%share/man/man5/utags.5.gz
 %%MANPAGES%%share/man/man7/uctags-client-tools.7.gz
 %%MANPAGES%%share/man/man7/uctags-faq.7.gz
 %%MANPAGES%%share/man/man7/uctags-incompatibilities.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-asm.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-autoit.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-automake.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-c++.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-c.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-cuda.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-elm.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-fortran.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-gdscript.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-i18nrubygem.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-iPythonCell.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-inko.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-javascript.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-julia.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-kconfig.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-ldscript.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-markdown.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-python.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-r.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-rmarkdown.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-sql.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-systemtap.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-tcl.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-terraform.7.gz
 %%MANPAGES%%share/man/man7/uctags-lang-verilog.7.gz
+%%MANPAGES%%share/man/man7/uctags-lang-vim.7.gz
 %%MANPAGES%%share/man/man7/uctags-optlib.7.gz