diff --git a/security/nikto/Makefile b/security/nikto/Makefile
index fb33ffa7920e..eac8b488b97c 100644
--- a/security/nikto/Makefile
+++ b/security/nikto/Makefile
@@ -8,14 +8,13 @@
 #
 
 PORTNAME=	nikto
-PORTVERSION=	2.1.1
+PORTVERSION=	2.1.2
 PORTEPOCH=	1
 CATEGORIES=	security www
 MASTER_SITES=	http://www.cirt.net/${PORTNAME}/ \
-		http://www.mirrors.wiretapped.net/security/vulnerability-assessment/${PORTNAME}/ \
-		http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
+		http://www.mirrors.wiretapped.net/security/vulnerability-assessment/${PORTNAME}/
 
-MAINTAINER=	niels@heinen.ws
+MAINTAINER=	niels@freebsd.org
 COMMENT=	Web and CGI vulnerability scanner with SSL support
 
 MAN1=		nikto.1
diff --git a/security/nikto/distinfo b/security/nikto/distinfo
index ed132c428bc0..5fa4eb63761b 100644
--- a/security/nikto/distinfo
+++ b/security/nikto/distinfo
@@ -1,3 +1,3 @@
-MD5 (nikto-2.1.1.tar.bz2) = 4a7ca9634190eba8cac9847117a72446
-SHA256 (nikto-2.1.1.tar.bz2) = 11443267c33ebdc696e39a9e76f5a842f5dc568afc7351d22310991ee900c29d
-SIZE (nikto-2.1.1.tar.bz2) = 262100
+MD5 (nikto-2.1.2.tar.bz2) = 42fd9748dc2d3949553a83660c36a503
+SHA256 (nikto-2.1.2.tar.bz2) = 813b457ec181c9e71b4d441161c457de198328e46de8c91c53182d03ace65376
+SIZE (nikto-2.1.2.tar.bz2) = 269382
diff --git a/security/nikto/pkg-plist b/security/nikto/pkg-plist
index c362acd5ef56..6e182640575b 100644
--- a/security/nikto/pkg-plist
+++ b/security/nikto/pkg-plist
@@ -1,9 +1,9 @@
 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
 etc/nikto.conf.sample
-@exec [ -f %B/nikto.conf ] || cp %B/%f %B/nikto.conf
 %%DATADIR%%/plugins/LW2.pm
 %%DATADIR%%/plugins/db_404_strings
+%%DATADIR%%/plugins/db_content_search
 %%DATADIR%%/plugins/db_embedded
 %%DATADIR%%/plugins/db_favicon
 %%DATADIR%%/plugins/db_headers
@@ -17,7 +17,9 @@ etc/nikto.conf.sample
 %%DATADIR%%/plugins/db_variables
 %%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_content_search.plugin
 %%DATADIR%%/plugins/nikto_core.plugin
 %%DATADIR%%/plugins/nikto_dictionary_attack.plugin
 %%DATADIR%%/plugins/nikto_embedded.plugin
@@ -26,19 +28,17 @@ etc/nikto.conf.sample
 %%DATADIR%%/plugins/nikto_httpoptions.plugin
 %%DATADIR%%/plugins/nikto_msgs.plugin
 %%DATADIR%%/plugins/nikto_multiple_index.plugin
-%%DATADIR%%/plugins/nikto_mutate.plugin
 %%DATADIR%%/plugins/nikto_outdated.plugin
-%%DATADIR%%/plugins/nikto_passfiles.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_text.plugin
 %%DATADIR%%/plugins/nikto_report_xml.plugin
 %%DATADIR%%/plugins/nikto_robots.plugin
 %%DATADIR%%/plugins/nikto_single.plugin
 %%DATADIR%%/plugins/nikto_subdomain.plugin
 %%DATADIR%%/plugins/nikto_tests.plugin
-%%DATADIR%%/plugins/nikto_user_enum_apache.plugin
 %%DATADIR%%/templates/htm_close.tmpl
 %%DATADIR%%/templates/htm_end.tmpl
 %%DATADIR%%/templates/htm_host_head.tmpl