Index: devel/universal-ctags/Makefile
===================================================================
--- devel/universal-ctags/Makefile
+++ devel/universal-ctags/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	universal-ctags
-PORTVERSION=	g20170718
+PORTVERSION=	g20171017
 CATEGORIES=	devel
 
 MAINTAINER=	dereks@lifeofadishwasher.com
@@ -16,11 +16,13 @@
 
 USE_GITHUB=	YES
 GH_PROJECT=	ctags
-GH_TAGNAME=	5567535e
+GH_TAGNAME=	ccac4dff
 
 OPTIONS_DEFINE=			ASPELL DEBUG ICONV JSON LIBXML2 MANPAGES YAML
 OPTIONS_DEFAULT=		ICONV JSON LIBXML2 MANPAGES YAML
 
+CONFIGURE_ARGS=	--program-prefix=u
+
 JSON_DESC=			JSON output support
 
 ASPELL_CONFIGURE_ENABLE=	aspell
@@ -42,15 +44,15 @@
 JSON_LIB_DEPENDS=		libjansson.so:devel/jansson
 
 MANPAGES_BUILD_DEPENDS=		rst2man:textproc/py-docutils
-MANPAGES_PLIST_FILES=		man/man1/ctags.1.gz \
-				man/man7/ctags-incompatibilities.7.gz \
-				man/man7/ctags-optlib.7.gz
+MANPAGES_PLIST_FILES=		man/man1/uctags.1.gz \
+				man/man7/uctags-incompatibilities.7.gz \
+				man/man7/uctags-optlib.7.gz
 
 YAML_CONFIGURE_ENABLE=		yaml
 YAML_LIB_DEPENDS=		libyaml.so:textproc/libyaml
 
-PLIST_FILES=			bin/ctags \
-				bin/readtags
+PLIST_FILES=			bin/uctags \
+				bin/ureadtags
 
 pre-configure:
 	# test-case.mak is generated by autogen.sh disable it for building
Index: devel/universal-ctags/distinfo
===================================================================
--- devel/universal-ctags/distinfo
+++ devel/universal-ctags/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502243666
-SHA256 (universal-ctags-ctags-g20170718-5567535e_GH0.tar.gz) = 9b0f71c05fd067d7f9c7c8b320c3383f2eaacb6f3cff131c5624363dc5fe104c
-SIZE (universal-ctags-ctags-g20170718-5567535e_GH0.tar.gz) = 1301783
+TIMESTAMP = 1508301239
+SHA256 (universal-ctags-ctags-g20171017-ccac4dff_GH0.tar.gz) = 630e931dd5c9fbdca8205e570509cd6c116604892f1cf5c20168023a80d3049d
+SIZE (universal-ctags-ctags-g20171017-ccac4dff_GH0.tar.gz) = 1346150