diff --git a/security/nikto/Makefile b/security/nikto/Makefile
index 0aaba9121221..12ef95c1f68f 100644
--- a/security/nikto/Makefile
+++ b/security/nikto/Makefile
@@ -8,8 +8,7 @@
 #
 
 PORTNAME=	nikto
-PORTVERSION=	1.36
-PORTREVISION=	1
+PORTVERSION=	2.02
 CATEGORIES=	security www
 MASTER_SITES=	http://www.cirt.net/${PORTNAME}/ \
 		http://www.mirrors.wiretapped.net/security/vulnerability-assessment/${PORTNAME}/ \
@@ -23,8 +22,7 @@ USE_BZIP2=	yes
 USE_PERL5_RUN=	yes
 NO_BUILD=	yes
 
-PORTDOCS=	CHANGES.txt README_plugins.txt nikto_usage.html nikto_usage.txt
-MAN1=		${PORTNAME}.1
+PORTDOCS=	CHANGES.txt LICENSE.txt nikto_manual.html
 
 OPTIONS+=	SSLEAY "Use NET::SSLeay for ssl scanning" on
 OPTIONS+=	NMAP "Use security/nmap for port scanning" on
@@ -43,13 +41,12 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local/bin/perl|${PERL}|" ${WRKSRC}/nikto.pl
 	@${REINPLACE_CMD} -Ee "s,(config.txt),${PREFIX}/etc/nikto.conf," ${WRKSRC}/nikto.pl
 	@${REINPLACE_CMD} -Ee "s|/usr/bin/nmap|${LOCALBASE}/bin/nmap|g" \
-		-e "s|# (PLUGINDIR=)/usr/local/nikto/plugins|\1${DATADIR}|g" \
+		-e "s|# (EXECDIR=)/usr/local/nikto|\1${DATADIR}|g" \
 		${WRKSRC}/config.txt
 	@${REINPLACE_CMD} "s/config.txt/nikto.conf/g" ${WRKSRC}/plugins/* ${WRKSRC}/docs/*
-	@${REINPLACE_CMD} -e 's:\$NIKTO{plugindir}/../docs/CHANGES.txt:\$NIKTO{plugindir}/../doc/nikto/CHANGES.txt:' \
-		-e 's:\$NIKTO{plugindir}/../CHANGES.txt:\$NIKTO{plugindir}/../doc/nikto/CHANGES.txt:' \
+	@${REINPLACE_CMD} -e 's:\$NIKTO{plugindir}/../docs/CHANGES.txt:\$NIKTO{plugindir}/../../doc/nikto/CHANGES.txt:' \
+		-e 's:\$NIKTO{plugindir}/../CHANGES.txt:\$NIKTO{plugindir}/../../doc/nikto/CHANGES.txt:' \
 		${WRKSRC}/plugins/nikto_core.plugin
-	@${MV} ${WRKSRC}/docs/${PORTNAME}-${PORTVERSION}.man ${WRKSRC}/docs/${PORTNAME}.1
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/nikto.pl ${PREFIX}/bin/nikto
@@ -57,17 +54,17 @@ do-install:
 	[ -f ${PREFIX}/etc/nikto.conf ] || \
 		${INSTALL_DATA} ${WRKSRC}/config.txt ${PREFIX}/etc/nikto.conf
 	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/plugins/LW.pm ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/plugins/*.db ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/plugins/nikto_plugin_order.txt ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/plugins/*.plugin ${DATADIR}
-
+	@${MKDIR} ${DATADIR}/plugins
+	${INSTALL_DATA} ${WRKSRC}/plugins/LW2.pm ${DATADIR}/plugins
+	@${RM} ${WRKSRC}/plugins/db_*.bak
+	${INSTALL_DATA} ${WRKSRC}/plugins/db_* ${DATADIR}/plugins
+	${INSTALL_DATA} ${WRKSRC}/plugins/nikto_plugin_order.txt ${DATADIR}/plugins
+	${INSTALL_DATA} ${WRKSRC}/plugins/*.plugin ${DATADIR}/plugins
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .	for i in ${PORTDOCS}
 		${INSTALL_DATA} ${WRKSRC}/docs/${i} ${DOCSDIR}
 .	endfor
 .endif
-	${INSTALL_MAN} ${WRKSRC}/docs/${MAN1} ${MAN1PREFIX}/man/man1
 
 .include <bsd.port.post.mk>
diff --git a/security/nikto/distinfo b/security/nikto/distinfo
index 627b148f8be0..a7b6e8b6a129 100644
--- a/security/nikto/distinfo
+++ b/security/nikto/distinfo
@@ -1,3 +1,3 @@
-MD5 (nikto-1.36.tar.bz2) = d70107deb225489ecf20e2b46684674e
-SHA256 (nikto-1.36.tar.bz2) = a4592d473358ee17217debe0f6f2da8ed0d130010e34db5bde08692231335ffb
-SIZE (nikto-1.36.tar.bz2) = 174712
+MD5 (nikto-2.02.tar.bz2) = e623ca31c20ec4b18368e3c4be4b9085
+SHA256 (nikto-2.02.tar.bz2) = 50ada4a2527f9760e44fc789c0ba7656178f6184643df51dc543d151ef0c1d32
+SIZE (nikto-2.02.tar.bz2) = 198641
diff --git a/security/nikto/pkg-plist b/security/nikto/pkg-plist
index 026a5a36f922..b552ca06ab03 100644
--- a/security/nikto/pkg-plist
+++ b/security/nikto/pkg-plist
@@ -2,24 +2,30 @@ bin/nikto
 @unexec if cmp -s %D/etc/nikto.conf %D/etc/nikto.conf.sample; then rm -f %D/etc/nikto.conf; fi
 etc/nikto.conf.sample
 @exec [ -f %B/nikto.conf ] || cp %B/%f %B/nikto.conf
-%%DATADIR%%/nikto_mutate.plugin
-%%DATADIR%%/nikto_outdated.plugin
-%%DATADIR%%/nikto_apacheusers.plugin
-%%DATADIR%%/nikto_passfiles.plugin
-%%DATADIR%%/nikto_httpoptions.plugin
-%%DATADIR%%/nikto_msgs.plugin
-%%DATADIR%%/server_msgs.db
-%%DATADIR%%/outdated.db
-%%DATADIR%%/scan_database.db
-%%DATADIR%%/nikto_core.plugin
-%%DATADIR%%/nikto_headers.plugin
-%%DATADIR%%/nikto_plugin_order.txt
-%%DATADIR%%/nikto_put_del_test.plugin
-%%DATADIR%%/nikto_realms.plugin
-%%DATADIR%%/nikto_robots.plugin
-%%DATADIR%%/nikto_user_enum_apache.plugin
-%%DATADIR%%/nikto_user_enum_cgiwrap.plugin
-%%DATADIR%%/realms.db
-%%DATADIR%%/servers.db
-%%DATADIR%%/LW.pm
+%%DATADIR%%/plugins/LW2.pm
+%%DATADIR%%/plugins/db_404_strings
+%%DATADIR%%/plugins/db_favicon
+%%DATADIR%%/plugins/db_outdated
+%%DATADIR%%/plugins/db_realms
+%%DATADIR%%/plugins/db_server_msgs
+%%DATADIR%%/plugins/db_tests
+%%DATADIR%%/plugins/db_variables
+%%DATADIR%%/plugins/nikto_apache_expect_xss.plugin
+%%DATADIR%%/plugins/nikto_apacheusers.plugin
+%%DATADIR%%/plugins/nikto_core.plugin
+%%DATADIR%%/plugins/nikto_favicon.plugin
+%%DATADIR%%/plugins/nikto_headers.plugin
+%%DATADIR%%/plugins/nikto_httpoptions.plugin
+%%DATADIR%%/plugins/nikto_msgs.plugin
+%%DATADIR%%/plugins/nikto_mutate.plugin
+%%DATADIR%%/plugins/nikto_outdated.plugin
+%%DATADIR%%/plugins/nikto_passfiles.plugin
+%%DATADIR%%/plugins/nikto_plugin_order.txt
+%%DATADIR%%/plugins/nikto_put_del_test.plugin
+%%DATADIR%%/plugins/nikto_reports.plugin
+%%DATADIR%%/plugins/nikto_robots.plugin
+%%DATADIR%%/plugins/nikto_single.plugin
+%%DATADIR%%/plugins/nikto_user_enum_apache.plugin
+%%DATADIR%%/plugins/nikto_user_enum_cgiwrap.plugin
+@dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%