diff --git a/net-analyzer/metagoofil/Manifest b/net-analyzer/metagoofil/Manifest
index 8bf4d068c..f1c1ba140 100644
--- a/net-analyzer/metagoofil/Manifest
+++ b/net-analyzer/metagoofil/Manifest
@@ -1 +1,2 @@
-DIST metagoofil-1.4b.tar 34304 SHA256 d8e64321661e3a2012bc1766d6cce09b73a7a1eaf1bc11e8ee5bb6a89c2cf26e SHA512 340c7df7c56b83e7f4977d342c5b1a5982d267a009fcc4f3e64c61dc77fb070d7512d69809db07d69a8d759ad60a4cf4b22a1faf7a4c3c43a5d17331d572ac44 WHIRLPOOL e8ffb06707f887fe868923056e06a5656d1ab69daeabbafd7880d9d1b29cc1f635012d6814e4d9a74eeedcc1152124b8edf88bedbfb61a39c834d12762ee7da8
+DIST metagoofil-1.4b.tar 34304 BLAKE2B cb6c7fd0a1725c0aee1d3571c1d29c088f8965968980974884d7930da58c22f5a50e8ce8a0eb2345dd6135877f5f93c0998cfe2d47b20d32e50a41e2fa3e3767 SHA512 340c7df7c56b83e7f4977d342c5b1a5982d267a009fcc4f3e64c61dc77fb070d7512d69809db07d69a8d759ad60a4cf4b22a1faf7a4c3c43a5d17331d572ac44
+DIST metagoofil-2.2.zip 699382 BLAKE2B 7318732d3f6502e3352e8d0af1598cc2a03e6f4a798e49e67b6c373639f4bab5e32c8c1c66adf368bd8c3fc8a2c3675493fe3f564fb610699a1c7f8116794ba2 SHA512 dc25ffe8bd2527cc4f8cd4eda869cbb37a32fc87a62ed7c18e76d465ecc8783c509f717615fee52a9bcfaead75e9652e5857e953a7bdb94629dc8a2e205f24f6
diff --git a/net-analyzer/metagoofil/files/metagoofil b/net-analyzer/metagoofil/files/metagoofil
new file mode 100644
index 000000000..8827e3742
--- /dev/null
+++ b/net-analyzer/metagoofil/files/metagoofil
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd /usr/share/metagoofil
+python2 ./metagoofil.py "$@"
diff --git a/net-analyzer/metagoofil/metagoofil-1.4b-r1.ebuild b/net-analyzer/metagoofil/metagoofil-1.4b-r1.ebuild
index 70dc0b884..d9eeedcd8 100644
--- a/net-analyzer/metagoofil/metagoofil-1.4b-r1.ebuild
+++ b/net-analyzer/metagoofil/metagoofil-1.4b-r1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
 
 PYTHON_COMPAT=( python2_7 )
 inherit python-single-r1
 
-DESCRIPTION="Metagoofil is an information gathering tool designed for extracting metadata of public documents"
+DESCRIPTION="Information gathering tool designed for extracting metadata of public documents"
 HOMEPAGE="http://www.edge-security.com/metagoofil.php"
 SRC_URI="http://www.edge-security.com/soft/${P}.tar"
 
diff --git a/net-analyzer/metagoofil/metagoofil-2.2.ebuild b/net-analyzer/metagoofil/metagoofil-2.2.ebuild
new file mode 100644
index 000000000..97e972625
--- /dev/null
+++ b/net-analyzer/metagoofil/metagoofil-2.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+MY_COMMIT="823b1146eb13a6e5c4f72b33461af5289b191abb"
+
+DESCRIPTION="Information gathering tool designed for extracting metadata of public documents"
+HOMEPAGE="http://www.edge-security.com/metagoofil.php"
+SRC_URI="https://github.com/laramies/metagoofil/archive/${MY_COMMIT}.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="media-libs/libextractor"
+
+S=${WORKDIR}/${PN}-${MY_COMMIT}
+
+src_configure() {
+	# Add the following line, so metagoofil.py can be executed directly.
+	sed -i '1i#!\/usr\/bin\/python' "${PN}".py || die
+
+	# change libextractor default location
+#	sed -i -e "s:/opt/local/bin/extract:/usr/bin/extract:g"	"${PN}".py || die
+}
+
+src_install() {
+	dobin "${FILESDIR}/${PN}"
+
+	dodir /usr/share/"${PN}"
+	cp -r . "${ED}"/usr/share/${PN}/
+
+	dodoc README LICENSES
+}
diff --git a/profiles/pentoo/base/package.accept_keywords/net-analyzer b/profiles/pentoo/base/package.accept_keywords/net-analyzer
index 14166434f..e88c370c7 100644
--- a/profiles/pentoo/base/package.accept_keywords/net-analyzer
+++ b/profiles/pentoo/base/package.accept_keywords/net-analyzer
@@ -64,7 +64,7 @@ net-analyzer/hyenae
 ~net-analyzer/masscan-1.0.3
 ~net-analyzer/mbrowse-0.4.3
 =net-analyzer/medusa-2.2*
-~net-analyzer/metagoofil-1.4b
+~net-analyzer/metagoofil-2.2
 =net-analyzer/nacker-0.0.1_pre*
 ~net-analyzer/nbtscan-1.5.1
 ~net-analyzer/ncrack-0.4_alpha