diff --git a/devel/universal-ctags/Makefile b/devel/universal-ctags/Makefile
index 676ebf830e65..c1789f9c074b 100644
--- a/devel/universal-ctags/Makefile
+++ b/devel/universal-ctags/Makefile
@@ -1,50 +1,49 @@
 # Created by: Derek Schrock <dereks@lifeofadishwasher.com>
 
 PORTNAME=	universal-ctags
-PORTVERSION=	p5.9.20220306.0
-PORTREVISION=	2
+PORTVERSION=	p5.9.20220424.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 PCRE2 YAML
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE:NDEBUG}
 OPTIONS_SUB=		yes
 
 JSON_DESC=	JSON output support
 PCRE2_DESC=	${PCRE_DESC} v2
 
 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
 
 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 f02287c59552..cc492b6b0473 100644
--- a/devel/universal-ctags/distinfo
+++ b/devel/universal-ctags/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1646606250
-SHA256 (universal-ctags-ctags-p5.9.20220306.0_GH0.tar.gz) = 54a5d8b5ab986790b020b79b3bb5125f3dd262ca706566a232736eb8dea1c09d
-SIZE (universal-ctags-ctags-p5.9.20220306.0_GH0.tar.gz) = 2833869
+TIMESTAMP = 1650839485
+SHA256 (universal-ctags-ctags-p5.9.20220424.0_GH0.tar.gz) = c20cb0d9841c8e2239d481eccfad978b4864bdc8b22be29969d533527b8302fa
+SIZE (universal-ctags-ctags-p5.9.20220424.0_GH0.tar.gz) = 2916022
diff --git a/devel/universal-ctags/files/patch-Tmain_map-removing.d_run.sh b/devel/universal-ctags/files/patch-Tmain_map-removing.d_run.sh
deleted file mode 100644
index 114bc757307f..000000000000
--- a/devel/universal-ctags/files/patch-Tmain_map-removing.d_run.sh
+++ /dev/null
@@ -1,32 +0,0 @@
---- Tmain/map-removing.d/run.sh.orig	2021-04-18 04:45:23 UTC
-+++ Tmain/map-removing.d/run.sh
-@@ -6,25 +6,25 @@ CTAGS=$1
- echo default map including '*.m'
- echo =======================================
- ${CTAGS} --quiet --options=NONE \
--	 --list-maps | grep '\*\.m\>.*$'
-+	 --list-maps | grep '\*\.m\>'
- echo
- 
- echo '[--map-<LANG>]' removing from '*.m' from 'ObjectiveC'
- echo =======================================
- ${CTAGS} --quiet --options=NONE \
--	 --map-ObjectiveC=-.m --list-maps | grep '\*\.m\>.*$'
-+	 --map-ObjectiveC=-.m --list-maps | grep '\*\.m\>'
- echo
- 
- echo '[--map-<LANG>]' adding '*.m' to 'Ada'
- echo =======================================
- ${CTAGS} --quiet --options=NONE \
--	 --map-Ada=+.m --list-maps | grep '\*\.m\>.*$'
-+	 --map-Ada=+.m --list-maps | grep '\*\.m\>'
- echo
- 
- echo '[--map-<LANG>]' removing from '*.m' from 'ObjectiveC', and adding '*.m' to 'Ada'
- echo =======================================
- ${CTAGS} --quiet --options=NONE \
--	 --map-ObjectiveC=-.m --map-Ada=+.m --list-maps | grep '\*\.m\>.*$'
-+	 --map-ObjectiveC=-.m --map-Ada=+.m --list-maps | grep '\*\.m\>'
- echo
- 
- echo '[--map-<LANG>]' guessing parser with adding '*.m' to 'Ada'
diff --git a/devel/universal-ctags/pkg-plist b/devel/universal-ctags/pkg-plist
index 2631d3998e46..3515d9ff8345 100644
--- a/devel/universal-ctags/pkg-plist
+++ b/devel/universal-ctags/pkg-plist
@@ -1,19 +1,21 @@
 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-lang-gdscript.7.gz
 %%MANPAGES%%man/man7/uctags-incompatibilities.7.gz
+%%MANPAGES%%man/man7/uctags-lang-elm.7.gz
+%%MANPAGES%%man/man7/uctags-lang-gdscript.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-rmarkdown.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