diff --git a/net-analyzer/unicornscan/Manifest b/net-analyzer/unicornscan/Manifest
index 2cbfdc046..691f3e843 100644
--- a/net-analyzer/unicornscan/Manifest
+++ b/net-analyzer/unicornscan/Manifest
@@ -1 +1 @@
-DIST unicornscan-0.4.7_p2.tar.gz 3194220 SHA256 ab75a028d1a9c4ef40e961428efcb97c5a3422001a55b04313a025b33cfadbd1 SHA512 275fec72e8768a7f16668c782f5f6ecaa142a3801f539aa9fd69f6e5d0a3252e8c4106d2cb0d5f0c6ea71a8e811b810610e780635dd92120182b5a64a2d6cef2 WHIRLPOOL d1eb740f14d671e54083e06b02060c94e039c0f9283a136ba8a40d621f1f9def859d008bacedb8c2203be587a18adf38c31159001b03dd1cf24dad42f65fc881
+DIST unicornscan-0.4.7.2.tar.gz 3194220 SHA256 ab75a028d1a9c4ef40e961428efcb97c5a3422001a55b04313a025b33cfadbd1 SHA512 275fec72e8768a7f16668c782f5f6ecaa142a3801f539aa9fd69f6e5d0a3252e8c4106d2cb0d5f0c6ea71a8e811b810610e780635dd92120182b5a64a2d6cef2 WHIRLPOOL d1eb740f14d671e54083e06b02060c94e039c0f9283a136ba8a40d621f1f9def859d008bacedb8c2203be587a18adf38c31159001b03dd1cf24dad42f65fc881
diff --git a/net-analyzer/unicornscan/unicornscan-0.4.7.2.ebuild b/net-analyzer/unicornscan/unicornscan-0.4.7.2.ebuild
new file mode 100644
index 000000000..abd343d6a
--- /dev/null
+++ b/net-analyzer/unicornscan/unicornscan-0.4.7.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic eutils user versionator
+MY_PV=$(replace_version_separator 3 '-' )
+
+DESCRIPTION="A utility for information gathering or security auditing"
+HOMEPAGE="http://www.unicornscan.org"
+#SRC_URI="http://www.unicornscan.org/releases/${PN}-${MY_PV}.tar.bz2"
+SRC_URI="https://github.com/IFGHou/Unicornscan/archive/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="geoip httpd mysql postgres"
+
+DEPEND="net-libs/libpcap
+	dev-libs/libdnet
+	sys-devel/libtool
+	geoip? ( dev-libs/geoip )
+	mysql? ( dev-db/mysql )
+	postgres? ( dev-db/postgresql-base:8.4 )"
+RDEPEND="${DEPEND}
+	httpd? ( dev-lang/php[apache2]
+		www-servers/apache )"
+
+S="${WORKDIR}/Unicornscan-${PN}-${MY_PV}"
+
+src_configure() {
+	epatch "${FILESDIR}"/${PN}-0.4.7-configure.patch
+	epatch "${FILESDIR}"/${PN}-0.4.7-gcc5.patch
+	epatch "${FILESDIR}"/${PN}-0.4.7-geoip.patch
+
+	local myconf=""
+
+	append-cppflags "-D_GNU_SOURCE"
+
+	if use geoip ; then
+		myconf="--with-geoip"
+	else
+		myconf="--without-geoip"
+	fi
+
+	if use mysql ; then
+		myconf="$myconf --with-mysql"
+	fi
+
+	if use postgres ; then
+		myconf="$myconf --with-pgsql"
+	fi
+
+	econf \
+		--with-libdnet=/usr \
+		--with-listen-user=unicornscan \
+		"${myconf}" || die
+}
+
+src_compile() {
+	emake
+}
+
+pkg_setup() {
+	enewgroup unicornscan
+	enewuser unicornscan -1 -1 -1 unicornscan
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+}
diff --git a/net-analyzer/unicornscan/unicornscan-0.4.7_p2.ebuild b/net-analyzer/unicornscan/unicornscan-0.4.7_p2.ebuild
deleted file mode 100644
index fbd40216d..000000000
--- a/net-analyzer/unicornscan/unicornscan-0.4.7_p2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit flag-o-matic eutils user
-
-MY_PV=${PV/_p/-}
-
-DESCRIPTION="A utility for information gathering or security auditing"
-HOMEPAGE="http://www.unicornscan.org"
-#SRC_URI="http://www.unicornscan.org/releases/${PN}-${MY_PV}.tar.bz2"
-SRC_URI="https://github.com/IFGHou/Unicornscan/archive/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="geoip httpd mysql postgres"
-
-DEPEND="net-libs/libpcap
-		dev-libs/libdnet
-		sys-devel/libtool
-		geoip? ( dev-libs/geoip )
-		mysql? ( dev-db/mysql )
-		postgres? ( dev-db/postgresql-base:8.4 )"
-RDEPEND="${DEPEND}
-		httpd? ( dev-lang/php[apache2]
-		 		  www-servers/apache )"
-
-S="${WORKDIR}/Unicornscan-${PN}-${MY_PV}"
-
-src_configure() {
-		epatch "${FILESDIR}"/${PN}-0.4.7-configure.patch
-		epatch "${FILESDIR}"/${PN}-0.4.7-gcc5.patch
-		epatch "${FILESDIR}"/${PN}-0.4.7-geoip.patch
-
-		local myconf=""
-
-		append-cppflags "-D_GNU_SOURCE"
-
-		if use geoip ; then
-				myconf="--with-geoip"
-		else
-				myconf="--without-geoip"
-		fi
-
-		if use mysql ; then
-				myconf="$myconf --with-mysql"
-		fi
-
-		if use postgres ; then
-				myconf="$myconf --with-pgsql"
-		fi
-
-		econf \
-				--with-libdnet=/usr \
-				--with-listen-user=unicornscan \
-				"${myconf}" || die
-}
-
-src_compile() {
-		emake || die
-}
-
-#pkg_setup() {
-#		enewgroup unicornscan
-#		enewuser unicornscan -1 -1 -1 unicornscan
-#}
-
-src_install() {
-		emake DESTDIR="${D}" install || die "Install failed"
-}