diff --git a/net-analyzer/nikto/Manifest b/net-analyzer/nikto/Manifest
index 40dc96090..5b3556b7a 100644
--- a/net-analyzer/nikto/Manifest
+++ b/net-analyzer/nikto/Manifest
@@ -1,7 +1,2 @@
-DIST nikto-2.1.3.tar.bz2 271642 SHA256 58df896390bd2770bb574f98107376740cf688225302704e4fe8a4d0f3cf2f7f
-DIST nikto-2.1.4.tar.bz2 288160 SHA256 9af930fea3f124e262d0e63977244b6bd19e22749f4defa818bb4d9b107ad603 SHA512 75cf3eeeefc4f70dbf27d76fed60db76afc1aac53847366ff83deaa7237c16cbfb7590ccbde40edd4d3ecab83a75bd3b7dcc24533d608317f6dca932d457813d WHIRLPOOL fcb04a9203068d28be4bc99537c7dc26b0fcc50fee25c3f49bbad2e943a918952e42d17a1e1640cb6def6145bfc238860977a1ab6db20dc808fed34690654e25
 DIST nikto-2.1.5.tar.bz2 311580 SHA256 65b99c1fdec14d1d5e7cbc964f70fce162cbec50aee878e1500e2d22df079b34 SHA512 623b0fa923c05ecc4b69087321b544941f09b4d84fb7a32f6970e2ea42b2018f2c4e2d1cd0fabfc1c99a2ca7b57fd8c0d9f5f13c86e7eb102f00bdfd3062a95f WHIRLPOOL c4b15484b3fcb9df9219743cc138073b9b24673cf1e20d066dd632da3dc8aa0ac21d5cd7bc5e012a8bfea8d75fc82d25d85fd37e0038bf9c217e8437eb2cea0d
-EBUILD nikto-2.1.3-r1.ebuild 1345 SHA256 4dd3ddb3fca96b182ebe7a4f58aba1b3cda49fbf5d78ab5ec10b8e8b4278c9e6 SHA512 39946613348b6e8b0d8a91a024d2e8e983d9d85cae84c95084393bb8d22e830c44187bb40496aa3e8c7f790924a05508fd478203c2dda71d2e1ba4bf017f1646 WHIRLPOOL 4c38cb3ae3b10c53281c43511525d7d6bc505b83d785d7ad50a107566db76af562c50019bd027aea62241141d24f334903cc9627231ebb843275234b068041c4
-EBUILD nikto-2.1.4.ebuild 1343 SHA256 0500d9f4aede33b7990478dcca81ab741d2c65c74d38d967e356d48a6a373a88 SHA512 f5c5eae2ea73b9085cccadbfb439add73e1432d4401fe5d6344d00023f589723af95b82034c00cd3d02e0bb956e9be7b7f5fa592edf70d43f0c88ff9edc64286 WHIRLPOOL 5473fe547c190ba24b1da6930438db1ea597417993001bd7ee0215ffbd053334e281221ea289768c350cae1aae8383db122e72f9d4bc5c7bd7fd842cad6d58c2
-EBUILD nikto-2.1.5-r1.ebuild 1380 SHA256 2323a40fd899e2dc757b433183cb99681461d19d872519483b16c58d4e7bae54 SHA512 f06738f857c7fd6da4d572668c148b3e6aed0143cc54eb9fd14fd35f4000705e8850452064e586ccf92612bbaa727bf65e950c2160d34789717db1fde89252da WHIRLPOOL 31eb840f3e725491af37efc9c6177fd237dca47ca3af86cf12010f85f6ce2bf08aa70397e3f383d7b967603b41ef1b429565b1e887474ab40348f8d89253e2cc
-EBUILD nikto-2.1.5.ebuild 1740 SHA256 72356f9c9f315d1c508f6df330a930e184278a8b4aeebbc179769a369b26d6a7 SHA512 2a079ac2a167e098b17f3de65651f263a53bca68fa6d0bb8ca4c387b4d6e32c445a8ca8e63f5a34791a12caa05b73326c7128891ddaf6fab70ff85fe1a9d1712 WHIRLPOOL 6d4c3ea2cd25127ecf575d1f63d9b6f5ca074bca7791c4ade6150b608854398ab4619f395022774b5d8dde16461eb02f49c4d6c412308c65347dced508970478
+EBUILD nikto-2.1.5-r2.ebuild 1740 SHA256 72356f9c9f315d1c508f6df330a930e184278a8b4aeebbc179769a369b26d6a7 SHA512 2a079ac2a167e098b17f3de65651f263a53bca68fa6d0bb8ca4c387b4d6e32c445a8ca8e63f5a34791a12caa05b73326c7128891ddaf6fab70ff85fe1a9d1712 WHIRLPOOL 6d4c3ea2cd25127ecf575d1f63d9b6f5ca074bca7791c4ade6150b608854398ab4619f395022774b5d8dde16461eb02f49c4d6c412308c65347dced508970478
diff --git a/net-analyzer/nikto/nikto-2.1.3-r1.ebuild b/net-analyzer/nikto/nikto-2.1.3-r1.ebuild
deleted file mode 100644
index db795f39f..000000000
--- a/net-analyzer/nikto/nikto-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-DESCRIPTION="Web Server vulnerability scanner."
-HOMEPAGE="http://www.cirt.net/code/nikto.shtml"
-SRC_URI="http://www.cirt.net/nikto/ARCHIVE/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="ssl"
-
-RDEPEND="dev-lang/perl
-	>=net-libs/libwhisker-2.5
-		ssl? (
-			dev-libs/openssl
-			dev-perl/Net-SSLeay
-		)"
-
-src_prepare() {
-	sed -i -e 's:config.txt:nikto.conf:g' \
-			plugins/* || die
-
-	sed -i -e 's:/etc/nikto.conf:/etc/nikto/nikto.conf:' \
-		 nikto.pl || die
-
-	sed -i -e 's:# EXECDIR=/usr/local/nikto:EXECDIR=/usr/share/nikto:' \
-		 nikto.conf || die
-
-	sed -i -e 's:# use LW2:use LW2:' \
-		 nikto.pl || die
-	sed -i -e 's:require "$NIKTOCONFIG{'\''PLUGINDIR'\''}/LW2.pm":# require "$NIKTOCONFIG{'\''PLUGINDIR'\''}/LW2.pm":' \
-		 nikto.pl || die
-	rm plugins/LW2.pm || die "removing bundled lib LW2.pm failed"
-}
-
-src_compile() {
-	einfo "nothing to compile"
-	true
-}
-
-src_install() {
-	insinto /etc/nikto
-	doins nikto.conf || die "config install failed"
-
-	dobin nikto.pl || die "install failed"
-	dosym /usr/bin/nikto.pl /usr/bin/nikto || die
-
-	dodir /usr/share/nikto
-	insinto /usr/share/nikto
-	doins -r plugins templates || die
-
-	dodoc docs/*.txt || die
-	dohtml docs/nikto_manual.html || die
-}
diff --git a/net-analyzer/nikto/nikto-2.1.4.ebuild b/net-analyzer/nikto/nikto-2.1.4.ebuild
deleted file mode 100644
index fbb6d2066..000000000
--- a/net-analyzer/nikto/nikto-2.1.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-DESCRIPTION="Web Server vulnerability scanner."
-HOMEPAGE="http://www.cirt.net/code/nikto.shtml"
-SRC_URI="http://www.cirt.net/nikto/ARCHIVE/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="ssl"
-
-RDEPEND="dev-lang/perl
-	>=net-libs/libwhisker-2.5
-		ssl? (
-			dev-libs/openssl
-			dev-perl/Net-SSLeay
-		)"
-
-src_prepare() {
-	sed -i -e 's:config.txt:nikto.conf:g' \
-			plugins/* || die
-
-	sed -i -e 's:/etc/nikto.conf:/etc/nikto/nikto.conf:' \
-		 nikto.pl || die
-
-	sed -i -e 's:# EXECDIR=/usr/local/nikto:EXECDIR=/usr/share/nikto:' \
-		 nikto.conf || die
-
-	sed -i -e 's:# use LW2:use LW2:' \
-		 nikto.pl || die
-	sed -i -e 's:require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":# require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":' \
-		 nikto.pl || die
-	rm plugins/LW2.pm || die "removing bundled lib LW2.pm failed"
-}
-
-src_compile() {
-	einfo "nothing to compile"
-	true
-}
-
-src_install() {
-	insinto /etc/nikto
-	doins nikto.conf || die "config install failed"
-
-	dobin nikto.pl || die "install failed"
-	dosym /usr/bin/nikto.pl /usr/bin/nikto || die
-
-	dodir /usr/share/nikto
-	insinto /usr/share/nikto
-	doins -r plugins templates || die
-
-	dodoc docs/*.txt || die
-	dohtml docs/nikto_manual.html || die
-}
diff --git a/net-analyzer/nikto/nikto-2.1.5-r1.ebuild b/net-analyzer/nikto/nikto-2.1.5-r1.ebuild
deleted file mode 100644
index 6b34c3f0a..000000000
--- a/net-analyzer/nikto/nikto-2.1.5-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-DESCRIPTION="Web Server vulnerability scanner."
-HOMEPAGE="http://www.cirt.net/code/nikto.shtml"
-SRC_URI="http://www.cirt.net/nikto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="ssl"
-
-RDEPEND="dev-lang/perl
-	net-analyzer/nmap
-		ssl? (
-			dev-libs/openssl
-			dev-perl/Net-SSLeay
-		)"
-#we can't reuse a system libwhisker anymore because some $#$on modified it.
-#see http://trac.assembla.com/Nikto_2/ticket/199 for more details
-#	net-libs/libwhisker[ssl?]
-
-src_prepare() {
-	sed -i -e 's:config.txt:nikto.conf:g' \
-			plugins/* || die
-
-	sed -i -e 's:/etc/nikto.conf:/etc/nikto/nikto.conf:' \
-		 nikto.pl || die
-
-	sed -i -e 's:# EXECDIR=/opt/nikto:EXECDIR=/usr/share/nikto:' \
-		 nikto.conf || die
-
-#	sed -i -e 's:# use LW2:use LW2:' \
-#		 nikto.pl || die
-#	sed -i -e 's:require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":# require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":' \
-#		 nikto.pl || die
-#	rm plugins/LW2.pm || die "removing bundled lib LW2.pm failed"
-}
-
-src_install() {
-	insinto /etc/nikto
-	doins nikto.conf
-
-	dobin nikto.pl replay.pl
-	dosym /usr/bin/nikto.pl /usr/bin/nikto
-
-	dodir /usr/share/nikto
-	insinto /usr/share/nikto
-	doins -r plugins templates databases
-
-	dodoc docs/*.txt
-	dohtml docs/nikto_manual.html
-}
diff --git a/net-analyzer/nikto/nikto-2.1.5.ebuild b/net-analyzer/nikto/nikto-2.1.5-r2.ebuild
similarity index 100%
rename from net-analyzer/nikto/nikto-2.1.5.ebuild
rename to net-analyzer/nikto/nikto-2.1.5-r2.ebuild