diff --git a/app-exploits/unix-privesc-check/Manifest b/app-exploits/unix-privesc-check/Manifest
deleted file mode 100644
index 4cd4fd14a..000000000
--- a/app-exploits/unix-privesc-check/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST unix-privesc-check-20170904.tar.gz 38277 BLAKE2B 59b98bd50d358b18095f0e3c33079c362114f100aeb8929e886de7f524b64d562e460a9859fe01b4d0eed6704abd6deed12a2886cdfb7cae4864627986b17e7b SHA512 b91d42dff6e95f945d59729658dd0d360584c755acdc520c677374217bc4577592e616bf14aa17fe3f83f3bf5dda5dd4712e8d9a91613f2d979f58331261a281
diff --git a/app-exploits/unix-privesc-check/metadata.xml b/app-exploits/unix-privesc-check/metadata.xml
new file mode 100644
index 000000000..4fa8ff351
--- /dev/null
+++ b/app-exploits/unix-privesc-check/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-exploits/unix-privesc-check/unix-privesc-check-20170904.ebuild b/app-exploits/unix-privesc-check/unix-privesc-check-20170904.ebuild
deleted file mode 100644
index f1d13a1a4..000000000
--- a/app-exploits/unix-privesc-check/unix-privesc-check-20170904.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Local Linux enumeration and privilege escalation checker."
-HOMEPAGE="https://github.com/pentestmonkey/unix-privesc-check"
-COMMIT="de8223a7b2ff3ed8fa6344cf4a358ec624e42270"
-MY_P="${PN}-${COMMIT}"
-SRC_URI="https://github.com/pentestmonkey/unix-privesc-check/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Unknown"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/unix-privesc-check
-	doins upc.sh
-}
-
diff --git a/app-exploits/unix-privesc-check/unix-privesc-check-20170904.ebuild b/app-exploits/unix-privesc-check/unix-privesc-check-20170904.ebuild
new file mode 120000
index 000000000..a2567557d
--- /dev/null
+++ b/app-exploits/unix-privesc-check/unix-privesc-check-20170904.ebuild
@@ -0,0 +1 @@
+./unix-privesc-check-99999999.ebuild
\ No newline at end of file
diff --git a/app-exploits/unix-privesc-check/unix-privesc-check-99999999.ebuild b/app-exploits/unix-privesc-check/unix-privesc-check-99999999.ebuild
new file mode 100644
index 000000000..a8fff8f71
--- /dev/null
+++ b/app-exploits/unix-privesc-check/unix-privesc-check-99999999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit git-r3
+
+DESCRIPTION="Shell script to check for simple privilege escalation vectors"
+HOMEPAGE="https://github.com/pentestmonkey/unix-privesc-check"
+
+EGIT_REPO_URI="https://github.com/pentestmonkey/unix-privesc-check"
+if [[ ${PV} != *9999 ]]; then
+	EGIT_COMMIT="de8223a7b2ff3ed8fa6344cf4a358ec624e42270"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Unlicense"
+SLOT="0"
+
+src_install() {
+	insinto /usr/share/unix-privesc-check
+	doins -r lib/ tools/ upc.sh
+	dodoc -r doc/* README.md
+}