diff --git a/devel/universal-ctags/Makefile b/devel/universal-ctags/Makefile
index bc0928f17ccc..60ef5a419854 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.20210411.0
+PORTVERSION=	p5.9.20210704.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 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 f936a3fea1d2..5afb7f6073cc 100644
--- a/devel/universal-ctags/distinfo
+++ b/devel/universal-ctags/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618176583
-SHA256 (universal-ctags-ctags-p5.9.20210411.0_GH0.tar.gz) = 5eb104570742de9b52b97880a1cbbfa48920f8f02ada22b7adff3c5287aecc72
-SIZE (universal-ctags-ctags-p5.9.20210411.0_GH0.tar.gz) = 2141061
+TIMESTAMP = 1625523297
+SHA256 (universal-ctags-ctags-p5.9.20210704.0_GH0.tar.gz) = 07c01e3ed8163100c9f17d6e74683cdb676a803b43f9ae3c3f2f828c027131d9
+SIZE (universal-ctags-ctags-p5.9.20210704.0_GH0.tar.gz) = 2221940
diff --git a/devel/universal-ctags/files/patch-misc_packcc_src_packcc.c b/devel/universal-ctags/files/patch-misc_packcc_src_packcc.c
deleted file mode 100644
index 5bc12de4c8f2..000000000000
--- a/devel/universal-ctags/files/patch-misc_packcc_src_packcc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/packcc/src/packcc.c.orig	2021-04-16 22:31:22 UTC
-+++ misc/packcc/src/packcc.c
-@@ -910,7 +910,7 @@ static size_t populate_bits(size_t x) {
-     x |= x >>  4;
-     x |= x >>  8;
-     x |= x >> 16;
--#ifndef _M_IX86 /* not Windows for x86 (32-bit) */
-+#if (defined __SIZEOF_SIZE_T__ && __SIZEOF_SIZE_T__ == 8)
-     x |= x >> 32;
- #endif
-     return x;
diff --git a/devel/universal-ctags/pkg-plist b/devel/universal-ctags/pkg-plist
index 4db159f3b303..86ce250c8841 100644
--- a/devel/universal-ctags/pkg-plist
+++ b/devel/universal-ctags/pkg-plist
@@ -1,14 +1,17 @@
 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-verilog.7.gz
 %%MANPAGES%%man/man7/uctags-optlib.7.gz