diff --git a/net-analyzer/nikto/Manifest b/net-analyzer/nikto/Manifest
index 7822811a8..2b5b43f32 100644
--- a/net-analyzer/nikto/Manifest
+++ b/net-analyzer/nikto/Manifest
@@ -1 +1,2 @@
 DIST nikto-2.1.6.tar.gz 490743 SHA256 c1731ae4133d3879718bb7605a8d395b2036668505effbcbbcaa4dae4e9f27f2 SHA512 13632018ef6862de7dc53c674d7266fcfb7e164bcf3070327c103cbf8737720ffb710ccc8949acc920a6e0a85da1bb7575d073ee245bc2ba3a8a292ad1695e69 WHIRLPOOL 9a45015154cea7ec6a02bab4583f0b529f634d1ba3a9a203a916e07a2c6c037b4d1876af22776f566d9adb6b8850b5dc33ab10c4e4a581729d28cab59f7a839e
+DIST nikto-2.1.6_p20180122.tar.gz 511615 SHA256 b5bba71300d5980218fd0b39a5bf24c466951b9c683c8e0bc42e97381be4e0c2 SHA512 4b9cae08146cefcfe4e929385631062f27cd13f5e516ec50fa9f9804a677a4a8846bc0f5de99bc1a25ec58ea8e2889bfa5953f8ca9cd7152e7b95b05861cac91 WHIRLPOOL ca5f72a49474ee4c50f422c71cb4d6c44edfeba4db5d78c12f7bff30db0959f54afad052165c28a64406e9a413612370416c5cf8bf53e60b7edbb9fba3991616
diff --git a/net-analyzer/nikto/nikto-2.1.6_p20180122.ebuild b/net-analyzer/nikto/nikto-2.1.6_p20180122.ebuild
new file mode 100644
index 000000000..e36b90cb4
--- /dev/null
+++ b/net-analyzer/nikto/nikto-2.1.6_p20180122.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="web server vulnerability scanner"
+HOMEPAGE="http://www.cirt.net/Nikto2"
+COMMIT="b8454661c4dc9249cb515311cb2a80906a0a4b7a"
+MY_P="${PN}-${COMMIT}"
+SRC_URI="https://github.com/sullo/nikto/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="ssl"
+
+RDEPEND="
+	dev-lang/perl
+	virtual/perl-JSON-PP
+	net-analyzer/nmap
+	ssl? (
+		dev-libs/openssl
+		dev-perl/Net-SSLeay
+	)
+"
+
+S="${WORKDIR}/${MY_P}/program"
+
+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
+
+	default
+}
+
+src_install() {
+	insinto /etc/nikto
+	doins nikto.conf
+
+	dobin nikto.pl replay.pl
+	dosym nikto.pl /usr/bin/nikto
+
+	dodir /usr/share/nikto
+	insinto /usr/share/nikto
+	doins -r plugins templates databases
+
+	dodoc docs/*.txt
+	dodoc docs/nikto_manual.html
+}