diff --git a/security/nikto/Makefile b/security/nikto/Makefile
index dcee511af13..fcbf6a5136e 100644
--- a/security/nikto/Makefile
+++ b/security/nikto/Makefile
@@ -1,38 +1,36 @@
-# $OpenBSD: Makefile,v 1.11 2008/09/23 21:21:01 rui Exp $
+# $OpenBSD: Makefile,v 1.12 2009/12/04 16:25:16 benoit Exp $
 
-COMMENT=	Web and CGI vulnerability scanner with SSL support
+COMMENT =	Web and CGI vulnerability scanner with SSL support
 
-DISTNAME=	nikto-2.03
-CATEGORIES=	security www
+DISTNAME =	nikto-2.1.0
+CATEGORIES =	security www
 
-HOMEPAGE=	http://www.cirt.net/code/nikto.shtml
+HOMEPAGE =	http://www.cirt.net/code/nikto.shtml
 
-MAINTAINER=	Rui Reis <rui@openbsd.org>
+MAINTAINER =	Rui Reis <rui@openbsd.org>
 
-MASTER_SITES=	http://www.cirt.net/nikto/ \
+# GPLv2
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP =	Yes
+
+MASTER_SITES =	http://www.cirt.net/nikto/ \
 		http://www.cirt.net/nikto/ARCHIVE/
-EXTRACT_SUFX=	.tar.bz2
 
-# GPL
-PERMIT_PACKAGE_CDROM=   Yes
-PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=   Yes
+EXTRACT_SUFX =	.tar.bz2
 
-RUN_DEPENDS=	:p5-Net-SSLeay-*:security/p5-Net_SSLeay
+RUN_DEPENDS =	:p5-Net-SSLeay-*:security/p5-Net_SSLeay
 
-NO_BUILD=	Yes
-NO_REGRESS=	Yes
-PKG_ARCH=	*
-
-WRKDIST=	${WRKDIR}/nikto
+NO_BUILD =	Yes
+NO_REGRESS =	Yes
+PKG_ARCH =	*
 
 pre-configure:
 	perl -pi -e 's,# EXECDIR=.+,EXECDIR=${PREFIX}/share/nikto,' \
-		${WRKSRC}/config.txt
-	perl -pi -e 's,config.txt,${SYSCONFDIR}/nikto.conf,' ${WRKSRC}/nikto.pl
-	perl -pi -e 's,docs/CHANGES\.txt,doc/nikto/CHANGES.txt,g' \
-		${WRKSRC}/plugins/nikto_core.plugin
+		${WRKSRC}/nikto.conf
+	perl -pi -e 's,# DOCDIR=.+,DOCDIR=${PREFIX}/share/doc/nikto,' \
+		${WRKSRC}/nikto.conf
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/nikto/plugins
@@ -41,7 +39,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nikto
 
 	${INSTALL_SCRIPT} ${WRKSRC}/nikto.pl ${PREFIX}/bin/nikto
-	${INSTALL_DATA} ${WRKSRC}/config.txt \
+	${INSTALL_DATA} ${WRKSRC}/nikto.conf \
 		${PREFIX}/share/examples/nikto/nikto.conf
 
 	${INSTALL_DATA} ${WRKSRC}/plugins/* ${PREFIX}/share/nikto/plugins
diff --git a/security/nikto/distinfo b/security/nikto/distinfo
index 2003f652307..810b9d73435 100644
--- a/security/nikto/distinfo
+++ b/security/nikto/distinfo
@@ -1,5 +1,5 @@
-MD5 (nikto-2.03.tar.bz2) = jyhqeUOxKjQQiPAF+DLQhw==
-RMD160 (nikto-2.03.tar.bz2) = l3u3kRFcVCWXZtsQYCxwAOeIK9o=
-SHA1 (nikto-2.03.tar.bz2) = JCEaO+Gma3MEq/d/zdnxrJkJ7HI=
-SHA256 (nikto-2.03.tar.bz2) = YbeENFYMXDEfOMR+fmgWASycg6PP30qXjOqvNHGKO3M=
-SIZE (nikto-2.03.tar.bz2) = 399643
+MD5 (nikto-2.1.0.tar.bz2) = zpcSYuFPWsH/Y0uGNmvaqA==
+RMD160 (nikto-2.1.0.tar.bz2) = HVpgT0QByJ482Y0bX3LmG2YTfYY=
+SHA1 (nikto-2.1.0.tar.bz2) = 6dyc2qVS6Rh7SjSJ8Tug7Z2XcWs=
+SHA256 (nikto-2.1.0.tar.bz2) = iIPMke1YMcBawYkpp6k5ByKauYNjE8K/nkfjPzpORbU=
+SIZE (nikto-2.1.0.tar.bz2) = 230536
diff --git a/security/nikto/patches/patch-docs_nikto_1 b/security/nikto/patches/patch-docs_nikto_1
new file mode 100644
index 00000000000..0ac4f22124f
--- /dev/null
+++ b/security/nikto/patches/patch-docs_nikto_1
@@ -0,0 +1,12 @@
+penBSD$
+--- docs/nikto.1.orig	Sun Oct 18 00:26:52 2009
++++ docs/nikto.1	Thu Nov 26 11:00:36 2009
+@@ -54,7 +54,7 @@
+ .ne (2v + 1u)
+ .ie n \{\
+ .\" if n (TTY output), use uppercase
+-.toupper \\$*
++\$*
+ .\}
+ .el \{\
+ .nr an-break-flag 0
diff --git a/security/nikto/patches/patch-nikto_pl b/security/nikto/patches/patch-nikto_pl
new file mode 100644
index 00000000000..ab440907b32
--- /dev/null
+++ b/security/nikto/patches/patch-nikto_pl
@@ -0,0 +1,12 @@
+$OpenBSD: patch-nikto_pl,v 1.1 2009/12/04 16:25:20 benoit Exp $
+--- nikto.pl.orig	Fri Dec  4 16:58:13 2009
++++ nikto.pl	Fri Dec  4 16:58:27 2009
+@@ -289,7 +289,7 @@
+    }
+    unless (defined $NIKTOCONFIG{DOCUMENTDIR})
+    {
+-      $NIKTOCONFIG{DOCUMENTDIR}="$NIKTOCONFIG{EXECDIR}/docs";
++      $NIKTOCONFIG{DOCUMENTDIR}="$NIKTOCONFIG{DOCDIR}";
+    }
+    return;
+ }
diff --git a/security/nikto/pkg/PLIST b/security/nikto/pkg/PLIST
index a64b620e8b7..40169453450 100644
--- a/security/nikto/pkg/PLIST
+++ b/security/nikto/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2008/09/23 21:21:01 rui Exp $
+@comment $OpenBSD: PLIST,v 1.9 2009/12/04 16:25:22 benoit Exp $
 bin/nikto
 @man man/man1/nikto.1
 share/doc/nikto/
@@ -14,15 +14,24 @@ share/nikto/plugins/
 share/nikto/plugins/LW2.pm
 @comment no checksum
 share/nikto/plugins/db_404_strings
+share/nikto/plugins/db_embedded
 @comment no checksum
 share/nikto/plugins/db_favicon
 @comment no checksum
+share/nikto/plugins/db_headers
+@comment no checksum
+share/nikto/plugins/db_httpoptions
+@comment no checksum
+share/nikto/plugins/db_multiple_index
+@comment no checksum
 share/nikto/plugins/db_outdated
 @comment no checksum
 share/nikto/plugins/db_realms
 @comment no checksum
 share/nikto/plugins/db_server_msgs
 @comment no checksum
+share/nikto/plugins/db_subdomains
+@comment no checksum
 share/nikto/plugins/db_tests
 @comment no checksum
 share/nikto/plugins/db_variables
@@ -30,10 +39,15 @@ share/nikto/plugins/db_variables
 share/nikto/plugins/nikto_apache_expect_xss.plugin
 @comment no checksum
 share/nikto/plugins/nikto_apacheusers.plugin
+@comment no checksum
 share/nikto/plugins/nikto_cgi.plugin
 @comment no checksum
 share/nikto/plugins/nikto_core.plugin
 @comment no checksum
+share/nikto/plugins/nikto_dictionary_attack.plugin
+@comment no checksum
+share/nikto/plugins/nikto_embedded.plugin
+@comment no checksum
 share/nikto/plugins/nikto_favicon.plugin
 @comment no checksum
 share/nikto/plugins/nikto_headers.plugin
@@ -42,25 +56,33 @@ share/nikto/plugins/nikto_httpoptions.plugin
 @comment no checksum
 share/nikto/plugins/nikto_msgs.plugin
 @comment no checksum
+share/nikto/plugins/nikto_multiple_index.plugin
+@comment no checksum
 share/nikto/plugins/nikto_mutate.plugin
 @comment no checksum
 share/nikto/plugins/nikto_outdated.plugin
 @comment no checksum
 share/nikto/plugins/nikto_passfiles.plugin
 @comment no checksum
-share/nikto/plugins/nikto_plugin_order.txt
-@comment no checksum
 share/nikto/plugins/nikto_put_del_test.plugin
 @comment no checksum
-share/nikto/plugins/nikto_reports.plugin
+share/nikto/plugins/nikto_report_csv.plugin
+@comment no checksum
+share/nikto/plugins/nikto_report_html.plugin
+@comment no checksum
+share/nikto/plugins/nikto_report_text.plugin
+@comment no checksum
+share/nikto/plugins/nikto_report_xml.plugin
 @comment no checksum
 share/nikto/plugins/nikto_robots.plugin
 @comment no checksum
 share/nikto/plugins/nikto_single.plugin
 @comment no checksum
-share/nikto/plugins/nikto_user_enum_apache.plugin
+share/nikto/plugins/nikto_subdomain.plugin
 @comment no checksum
-share/nikto/plugins/nikto_user_enum_cgiwrap.plugin
+share/nikto/plugins/nikto_tests.plugin
+@comment no checksum
+share/nikto/plugins/nikto_user_enum_apache.plugin
 share/nikto/templates/
 share/nikto/templates/htm_close.tmpl
 @comment no checksum