diff --git a/dns/gdnsd2/Makefile b/dns/gdnsd2/Makefile
index 13b4ffb0517a..49bb5c35a647 100644
--- a/dns/gdnsd2/Makefile
+++ b/dns/gdnsd2/Makefile
@@ -1,55 +1,57 @@
 PORTNAME=	gdnsd
 PORTVERSION=	2.4.3
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	https://github.com/gdnsd/gdnsd/releases/download/v${PORTVERSION}/ \
 		ZI \
 		http://gdnsd.scaleengine.net/gdnsd/
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Authoritative-only GeoIP-aware DNS server
 WWW=		https://github.com/blblack/gdnsd
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libev.so:devel/libev
 BUILD_DEPENDS=	ragel>0:devel/ragel
 
 FETCH_ARGS=	-Fpr
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--localstatedir=/var
 USE_LDCONFIG=	yes
 USES=		cpe pkgconfig libtool tar:xz perl5 gmake
 USE_PERL5=	build
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFLICTS_INSTALL=	gdnsd3
 
 USE_RC_SUBR=	gdnsd
 
 USERS?=		gdnsd
 GROUPS?=	gdnsd
 
 OPTIONS_DEFINE=	DOCS MAXMINDDB URCU
 OPTIONS_DEFAULT=MAXMINDDB
 
 MAXMINDDB_DESC=		Enable GeoIP1 + GeoIP2 Support
 MAXMINDDB_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 
 URCU_DESC=		Read-Copy-Update Support (Faster Zone Parsing)
 URCU_CONFIGURE_WITH=	urcu
 URCU_LIB_DEPENDS=	liburcu.so:sysutils/liburcu
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${localstatedir}/lib/$${PACKAGE_NAME}|/var/db/${PORTNAME}|g' \
 		${WRKSRC}/configure
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/libgdnsd.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/plugin_*.so
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdnsd/geoip \
 		${STAGEDIR}${PREFIX}/etc/gdnsd/zones \
 		${STAGEDIR}/var/run/gdnsd
 
 .include <bsd.port.mk>
diff --git a/dns/gdnsd2/pkg-plist b/dns/gdnsd2/pkg-plist
index 45befff225aa..d3f86b8dbfe6 100644
--- a/dns/gdnsd2/pkg-plist
+++ b/dns/gdnsd2/pkg-plist
@@ -1,61 +1,61 @@
 bin/gdnsd_geoip_test
 include/gdnsd/alloc.h
 include/gdnsd/bopts.h
 include/gdnsd/compiler.h
 include/gdnsd/dmn.h
 include/gdnsd/dname.h
 include/gdnsd/file.h
 include/gdnsd/log.h
 include/gdnsd/misc.h
 include/gdnsd/mon.h
 include/gdnsd/net.h
 include/gdnsd/paths.h
 include/gdnsd/plugapi.h
 include/gdnsd/plugin.h
 include/gdnsd/prcu.h
 include/gdnsd/stats.h
 include/gdnsd/vscf.h
 lib/gdnsd/libgdnsd.so
 lib/gdnsd/plugin_extfile.so
 lib/gdnsd/plugin_extmon.so
 lib/gdnsd/plugin_geoip.so
 lib/gdnsd/plugin_http_status.so
 lib/gdnsd/plugin_metafo.so
 lib/gdnsd/plugin_multifo.so
 lib/gdnsd/plugin_null.so
 lib/gdnsd/plugin_reflect.so
 lib/gdnsd/plugin_simplefo.so
 lib/gdnsd/plugin_static.so
 lib/gdnsd/plugin_tcp_connect.so
 lib/gdnsd/plugin_weighted.so
 libexec/gdnsd/gdnsd_extmon_helper
-man/man1/gdnsd_geoip_test.1.gz
-man/man3/gdnsd-plugin-api.3.gz
-man/man5/gdnsd.config.5.gz
-man/man5/gdnsd.djbdns.5.gz
-man/man5/gdnsd.zonefile.5.gz
-man/man8/gdnsd-plugin-extfile.8.gz
-man/man8/gdnsd-plugin-extmon.8.gz
-man/man8/gdnsd-plugin-geoip.8.gz
-man/man8/gdnsd-plugin-http_status.8.gz
-man/man8/gdnsd-plugin-metafo.8.gz
-man/man8/gdnsd-plugin-multifo.8.gz
-man/man8/gdnsd-plugin-null.8.gz
-man/man8/gdnsd-plugin-reflect.8.gz
-man/man8/gdnsd-plugin-simplefo.8.gz
-man/man8/gdnsd-plugin-static.8.gz
-man/man8/gdnsd-plugin-tcp_connect.8.gz
-man/man8/gdnsd-plugin-weighted.8.gz
-man/man8/gdnsd.8.gz
 sbin/gdnsd
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/gdnsd_manual.txt
+share/man/man1/gdnsd_geoip_test.1.gz
+share/man/man3/gdnsd-plugin-api.3.gz
+share/man/man5/gdnsd.config.5.gz
+share/man/man5/gdnsd.djbdns.5.gz
+share/man/man5/gdnsd.zonefile.5.gz
+share/man/man8/gdnsd-plugin-extfile.8.gz
+share/man/man8/gdnsd-plugin-extmon.8.gz
+share/man/man8/gdnsd-plugin-geoip.8.gz
+share/man/man8/gdnsd-plugin-http_status.8.gz
+share/man/man8/gdnsd-plugin-metafo.8.gz
+share/man/man8/gdnsd-plugin-multifo.8.gz
+share/man/man8/gdnsd-plugin-null.8.gz
+share/man/man8/gdnsd-plugin-reflect.8.gz
+share/man/man8/gdnsd-plugin-simplefo.8.gz
+share/man/man8/gdnsd-plugin-static.8.gz
+share/man/man8/gdnsd-plugin-tcp_connect.8.gz
+share/man/man8/gdnsd-plugin-weighted.8.gz
+share/man/man8/gdnsd.8.gz
 @dir %%ETCDIR%%/djbdns
 @dir %%ETCDIR%%/geoip
 @dir %%ETCDIR%%/zones
 @dir /var/db/gdnsd
 @dir /var/run/gdnsd