diff --git a/net-analyzer/theHarvester/Manifest b/net-analyzer/theHarvester/Manifest
index 3a7468b..6762002 100644
--- a/net-analyzer/theHarvester/Manifest
+++ b/net-analyzer/theHarvester/Manifest
@@ -1,3 +1,3 @@
-AUX dns-names_path.patch 1010 RMD160 b9a8f2968607f15da3a693219be3be521686f3ee SHA1 368c644600cbf74834f3bc8278daead1a702fc6c SHA256 7c6eec96da93c17e18b55661176fb327fc146c5a6c50acc3190a08ce3f27b9fa
-DIST theHarvester-2.1_BH2011_Arsenal.tar 353792 RMD160 b0c216e846dd5aa6f25f610b7941b3c5264e349c SHA1 cf05c75aa8b38c7c696d980168888fdcc377f142 SHA256 f6dbb876082680dd540a94169cb0b5c27d93b6abd07c7b6610df0cfd6c022f5b
-EBUILD theHarvester-2.1.ebuild 1716 RMD160 37c8e320bc6a89e75272ac69dd84340fa7b6986e SHA1 2b07ab615c205609bd3c292e17509bd27ee48dc6 SHA256 d986f541e3601f27628d91228d370bc4409940a03d713f0209cb8564906f9a7c
+AUX dns-names_path.patch 1010 SHA256 7c6eec96da93c17e18b55661176fb327fc146c5a6c50acc3190a08ce3f27b9fa SHA512 35374be589a3de81e48a5406f2dcb21687cc547c9cd6cd6b53d2eec6ead75a6142d006edfbe9d0539833ea7dad34e83016a8ec567a4688ff3f27d127072c3c95 WHIRLPOOL dba328c3afb1329b399be14e53766fe0b9bfa195ac48db85bc497718c6de0d6f44275ab5162338a74a4d874cd800eac3c06b9a2634d005a64a74a519c7040229
+DIST master.zip 78634 SHA256 e8fecc73c7426fe687e1c7ac450a3cf52f9630d035e668ab8bfe67ddbda9d430 SHA512 ad39fc3e019481d14ca311214dc0c09eede5df8e478adfebc88a1e6ae138ac83f87ec853dc7953b1a8d35cc34f9a22e294ce2dc95909199146e0ed2a080bb3af WHIRLPOOL 1c03076b972fe55e38e29fbac8a830fb36da372758773b8f3c7b0b223121d4c99b6755d87979d143f0ff11bca0699175d14ed4aa194c4375347850bde4ab04ae
+EBUILD theHarvester-9999.ebuild 1056 SHA256 1af850fc5c5f1b3ec9eae825ac11a5e802b4cc5d1fe55e03dc6067a883577655 SHA512 71faabd097436e0c9328a8d9959f5d0e8f382390cacac72a12ec737770eeabc92e7bab83bb4eea442f1f5afd347346cf902e47c16af3538923daa75a9bf20285 WHIRLPOOL 011df33f4b826629e23d6f0a33cf21a871917bb06df8bf9e4009d6152eac5430df6b6860c4976cfac4332b9ca34fbdc9dbf4f36697b5cd5be09ac99082d44761
diff --git a/net-analyzer/theHarvester/theHarvester-2.1.ebuild b/net-analyzer/theHarvester/theHarvester-2.1.ebuild
deleted file mode 100644
index 19d3b12..0000000
--- a/net-analyzer/theHarvester/theHarvester-2.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils python
-
-DESCRIPTION="The Harvester is a tool designed to collect email accounts of the target domain"
-HOMEPAGE="http://www.edge-security.com/theHarvester.php"
-# SRC_URI="http://theharvester.googlecode.com/files/${PN}-ng-${PV}.tar"
-SRC_URI="http://theharvester.googlecode.com/files/theHarvester-2.1_BH2011_Arsenal.tar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-RESTRICT_PYTHON_ABIS="3.*"
-
-S="${WORKDIR}"/"${PN}-ng-blackhat"
-
-src_prepare() {
-    epatch "${FILESDIR}"/dns-names_path.patch
-
-	python_convert_shebangs 2 theHarvester.py;
-}
-
-src_install() {
-	installation() {
-		insinto $(python_get_sitedir)/${PN}
-		doins myparser.py
-		exeinto $(python_get_sitedir)/${PN}
-		doexe theHarvester.py
-		insinto $(python_get_sitedir)/${PN}/discovery
-		doins discovery/*.py
-		insinto $(python_get_sitedir)/${PN}/discovery/DNS
-		doins discovery/DNS/*.py
-		insinto $(python_get_sitedir)/${PN}/discovery/shodan
-		doins discovery/shodan/*.py
-		insinto $(python_get_sitedir)/${PN}/lib
-		doins lib/*.py
-
-        dosym $(python_get_sitedir)/${PN}/theHarvester.py /usr/bin/theHarvester.py
-	}
-
-    python_execute_function installation
-    insinto /usr/share/"${PN}"
-    doins dns-names.txt
-    # doins discovery/nameservers.txt
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}/discovery ${PN}/discovery/DNS ${PN}/discovery/shodan ${PN}/lib ${PN}/theHarvester.py ${PN}/myparser.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}/discovery ${PN}/discovery/DNS ${PN}/discovery/shodan ${PN}/lib ${PN}/theHarvester.py ${PN}/myparser.py
-}
diff --git a/net-analyzer/theHarvester/theHarvester-9999.ebuild b/net-analyzer/theHarvester/theHarvester-9999.ebuild
new file mode 100644
index 0000000..0e7b6c2
--- /dev/null
+++ b/net-analyzer/theHarvester/theHarvester-9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+SUPPORT_PYTHON_ABIS="1"
+
+inherit python
+
+DESCRIPTION="The Harvester is a tool designed to collect email accounts of the target domain"
+HOMEPAGE="http://www.edge-security.com/theharvester.php"
+SRC_URI="https://github.com/laramies/theHarvester/archive/master.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+RESTRICT_PYTHON_ABIS="3.*"
+
+S="${WORKDIR}"/"${PN}-master"
+
+src_prepare() {
+    python_convert_shebangs 2 theHarvester.py;
+}
+
+src_install() {
+    installation() {
+        insinto $(python_get_sitedir)
+        doins myparser.py
+        insinto $(python_get_sitedir)/discovery
+        doins -r discovery/*
+        insinto $(python_get_sitedir)/lib
+        doins lib/*.py
+    }
+    python_execute_function installation
+    dobin theHarvester.py
+    dodoc README LICENSES
+}
+
+pkg_postinst() {
+    python_mod_optimize discovery lib myparser.py
+}
+
+pkg_postrm() {
+    python_mod_cleanup discovery lib myparser.py
+}