diff --git a/security/nikto/Makefile b/security/nikto/Makefile
index 277c8899bf33..f5aeb0cd53c9 100644
--- a/security/nikto/Makefile
+++ b/security/nikto/Makefile
@@ -1,53 +1,54 @@
 PORTNAME=	nikto
 PORTVERSION=	2.1.6
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	security www
 
 MAINTAINER=	mbeis@xs4all.nl
 COMMENT=	Web and CGI vulnerability scanner with SSL support
 WWW=		https://cirt.net/nikto2
 
 LICENSE=	GPLv2
 
 USES=		cpe perl5 shebangfix
 CPE_VENDOR=	cirt.net
 USE_PERL5=	run
 
 GH_ACCOUNT=	sullo
 USE_GITHUB=	yes
 
 OPTIONS_DEFINE=	SSLEAY DOCS
 OPTIONS_DEFAULT=SSLEAY
 SSLEAY_DESC=	Use NET::SSLeay for ssl scanning
 SSLEAY_RUN_DEPENDS=	p5-Net-SSLeay>0:security/p5-Net-SSLeay
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 SHEBANG_FILES=	nikto.pl
 WRKSRC_SUBDIR=	program
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e \
 		's|/etc/nikto.conf|${PREFIX}/etc/nikto.conf|' ${WRKSRC}/nikto.pl
 	${REINPLACE_CMD} -Ee \
 		's|# (EXECDIR=).*/nikto|\1${DATADIR}| ; \
 		 s|# (DBDIR=).*/databases|\1${DATADIR}/databases| ; \
 		 s|# (PLUGINDIR=).*/plugins|\1${DATADIR}/plugins| ; \
 		 s|# (TEMPLATEDIR=).*/templates|\1${DATADIR}/templates| ; \
 		 s|# (DOCDIR=).*/docs|\1${DOCSDIR}|' ${WRKSRC}/nikto.conf
 
 do-install:	.SILENT
 	${INSTALL_SCRIPT} ${WRKSRC}/nikto.pl ${STAGEDIR}${PREFIX}/bin/nikto
-	${INSTALL_MAN} ${WRKSRC}/docs/nikto.1 ${STAGEDIR}${PREFIX}/man/man1/nikto.1
+	${INSTALL_MAN} ${WRKSRC}/docs/nikto.1 ${STAGEDIR}${PREFIX}/share/man/man1/nikto.1
 	${INSTALL_DATA} ${WRKSRC}/nikto.conf ${STAGEDIR}${PREFIX}/etc/nikto.conf.sample
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/replay.pl ${STAGEDIR}${DATADIR}
 .for i in databases plugins templates
 	cd ${WRKSRC}; ${COPYTREE_SHARE} ${i} ${STAGEDIR}${DATADIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs; ${INSTALL_DATA} CHANGES.txt LICENSE.txt nikto.dtd \
 		nikto_manual.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/nikto/pkg-plist b/security/nikto/pkg-plist
index cae74fda121b..3a1370f980d4 100644
--- a/security/nikto/pkg-plist
+++ b/security/nikto/pkg-plist
@@ -1,76 +1,76 @@
 bin/nikto
 @sample etc/nikto.conf.sample
-man/man1/nikto.1.gz
+share/man/man1/nikto.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/nikto.dtd
 %%PORTDOCS%%%%DOCSDIR%%/nikto_manual.html
 %%DATADIR%%/databases/db_404_strings
 %%DATADIR%%/databases/db_content_search
 %%DATADIR%%/databases/db_dictionary
 %%DATADIR%%/databases/db_drupal
 %%DATADIR%%/databases/db_embedded
 %%DATADIR%%/databases/db_favicon
 %%DATADIR%%/databases/db_headers
 %%DATADIR%%/databases/db_httpoptions
 %%DATADIR%%/databases/db_multiple_index
 %%DATADIR%%/databases/db_outdated
 %%DATADIR%%/databases/db_parked_strings
 %%DATADIR%%/databases/db_realms
 %%DATADIR%%/databases/db_server_msgs
 %%DATADIR%%/databases/db_subdomains
 %%DATADIR%%/databases/db_tests
 %%DATADIR%%/databases/db_variables
 %%DATADIR%%/plugins/LW2.pm
 %%DATADIR%%/plugins/nikto_apache_expect_xss.plugin
 %%DATADIR%%/plugins/nikto_apacheusers.plugin
 %%DATADIR%%/plugins/nikto_auth.plugin
 %%DATADIR%%/plugins/nikto_cgi.plugin
 %%DATADIR%%/plugins/nikto_clientaccesspolicy.plugin
 %%DATADIR%%/plugins/nikto_content_search.plugin
 %%DATADIR%%/plugins/nikto_cookies.plugin
 %%DATADIR%%/plugins/nikto_core.plugin
 %%DATADIR%%/plugins/nikto_dictionary_attack.plugin
 %%DATADIR%%/plugins/nikto_drupal.plugin
 %%DATADIR%%/plugins/nikto_embedded.plugin
 %%DATADIR%%/plugins/nikto_favicon.plugin
 %%DATADIR%%/plugins/nikto_fileops.plugin
 %%DATADIR%%/plugins/nikto_headers.plugin
 %%DATADIR%%/plugins/nikto_httpoptions.plugin
 %%DATADIR%%/plugins/nikto_ms10_070.plugin
 %%DATADIR%%/plugins/nikto_msgs.plugin
 %%DATADIR%%/plugins/nikto_multiple_index.plugin
 %%DATADIR%%/plugins/nikto_negotiate.plugin
 %%DATADIR%%/plugins/nikto_outdated.plugin
 %%DATADIR%%/plugins/nikto_parked.plugin
 %%DATADIR%%/plugins/nikto_paths.plugin
 %%DATADIR%%/plugins/nikto_put_del_test.plugin
 %%DATADIR%%/plugins/nikto_report_csv.plugin
 %%DATADIR%%/plugins/nikto_report_html.plugin
 %%DATADIR%%/plugins/nikto_report_nbe.plugin
 %%DATADIR%%/plugins/nikto_report_sqlg.plugin
 %%DATADIR%%/plugins/nikto_report_text.plugin
 %%DATADIR%%/plugins/nikto_report_xml.plugin
 %%DATADIR%%/plugins/nikto_robots.plugin
 %%DATADIR%%/plugins/nikto_shellshock.plugin
 %%DATADIR%%/plugins/nikto_siebel.plugin
 %%DATADIR%%/plugins/nikto_sitefiles.plugin
 %%DATADIR%%/plugins/nikto_ssl.plugin
 %%DATADIR%%/plugins/nikto_subdomain.plugin
 %%DATADIR%%/plugins/nikto_tests.plugin
 %%DATADIR%%/replay.pl
 %%DATADIR%%/templates/htm_close.tmpl
 %%DATADIR%%/templates/htm_end.tmpl
 %%DATADIR%%/templates/htm_host_head.tmpl
 %%DATADIR%%/templates/htm_host_im.tmpl
 %%DATADIR%%/templates/htm_host_item.tmpl
 %%DATADIR%%/templates/htm_start.tmpl
 %%DATADIR%%/templates/htm_stop.tmpl
 %%DATADIR%%/templates/htm_summary.tmpl
 %%DATADIR%%/templates/xml_close.tmpl
 %%DATADIR%%/templates/xml_end.tmpl
 %%DATADIR%%/templates/xml_host_head.tmpl
 %%DATADIR%%/templates/xml_host_im.tmpl
 %%DATADIR%%/templates/xml_host_item.tmpl
 %%DATADIR%%/templates/xml_start.tmpl
 %%DATADIR%%/templates/xml_summary.tmpl