diff --git a/security/ipv6toolkit/Makefile b/security/ipv6toolkit/Makefile
index a974531c7e81..1decb72a472c 100644
--- a/security/ipv6toolkit/Makefile
+++ b/security/ipv6toolkit/Makefile
@@ -1,51 +1,52 @@
 PORTNAME=	ipv6toolkit
 PORTVERSION=	2.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.si6networks.com/tools/ipv6toolkit/
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Set of IPv6 security assessment tools
 WWW=		https://www.si6networks.com/tools/ipv6toolkit/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 USES=		shebangfix uidfix
 SHEBANG_FILES=	tools/blackhole6 tools/script6
-MAKE_ENV=	DATADIR=${DATADIR} WRKSRC=${WRKSRC}
+MAKE_ENV=	DATADIR=${DATADIR} WRKSRC=${WRKSRC} MANDIR=${PREFIX}/share/man/man
 SUB_FILES=	BSDMakefile Makefile Makefile.lib
 MAKEFILE=	BSDMakefile
 PORTDOCS=	README.TXT CHANGES.TXT CREDITS.TXT
 
 CFLAGS+=	-fPIC
 
 PROGDIRS=	addr6 flow6 frag6 icmp6 jumbo6 na6 ni6 ns6 path6 ra6 rd6 rs6 \
 		scan6 tcp6 udp6
 LIBDIRS=	libipv6
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	@cd ${WRKSRC} && ${MKDIR} ${PROGDIRS} ${LIBDIRS}
 
 pre-build:
 	${INSTALL_DATA} ${WRKDIR}/BSDMakefile ${WRKSRC}
 	for D in ${PROGDIRS}; do \
 		${INSTALL_DATA} ${WRKDIR}/Makefile ${WRKSRC}/$$D; \
 	done
 	for D in ${LIBDIRS}; do \
 		${INSTALL_DATA} ${WRKDIR}/Makefile.lib ${WRKSRC}/$$D/Makefile; \
 	done
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/blackhole6 ${WRKSRC}/tools/script6 \
 	    ${STAGEDIR}${PREFIX}/sbin
 
 pre-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 
 post-install-DOCS-on:
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/ipv6toolkit/pkg-plist b/security/ipv6toolkit/pkg-plist
index f78a972d27cf..ddc570d4f3d4 100644
--- a/security/ipv6toolkit/pkg-plist
+++ b/security/ipv6toolkit/pkg-plist
@@ -1,38 +1,38 @@
 bin/addr6
 sbin/blackhole6
 sbin/flow6
 sbin/frag6
 sbin/icmp6
 sbin/jumbo6
 sbin/na6
 sbin/ni6
 sbin/ns6
 sbin/path6
 sbin/ra6
 sbin/rd6
 sbin/rs6
 sbin/scan6
 sbin/script6
 sbin/tcp6
 sbin/udp6
 etc/ipv6toolkit.conf
-man/man1/addr6.1.gz
-man/man1/blackhole6.1.gz
-man/man1/flow6.1.gz
-man/man1/frag6.1.gz
-man/man1/icmp6.1.gz
-man/man1/jumbo6.1.gz
-man/man1/na6.1.gz
-man/man1/ni6.1.gz
-man/man1/ns6.1.gz
-man/man1/path6.1.gz
-man/man1/ra6.1.gz
-man/man1/rd6.1.gz
-man/man1/rs6.1.gz
-man/man1/scan6.1.gz
-man/man1/script6.1.gz
-man/man1/tcp6.1.gz
-man/man1/udp6.1.gz
-man/man5/ipv6toolkit.conf.5.gz
-man/man7/ipv6toolkit.7.gz
 %%DATADIR%%/oui.txt
+share/man/man1/addr6.1.gz
+share/man/man1/blackhole6.1.gz
+share/man/man1/flow6.1.gz
+share/man/man1/frag6.1.gz
+share/man/man1/icmp6.1.gz
+share/man/man1/jumbo6.1.gz
+share/man/man1/na6.1.gz
+share/man/man1/ni6.1.gz
+share/man/man1/ns6.1.gz
+share/man/man1/path6.1.gz
+share/man/man1/ra6.1.gz
+share/man/man1/rd6.1.gz
+share/man/man1/rs6.1.gz
+share/man/man1/scan6.1.gz
+share/man/man1/script6.1.gz
+share/man/man1/tcp6.1.gz
+share/man/man1/udp6.1.gz
+share/man/man5/ipv6toolkit.conf.5.gz
+share/man/man7/ipv6toolkit.7.gz