diff --git a/net-analyzer/unicornscan/Manifest b/net-analyzer/unicornscan/Manifest
new file mode 100644
index 000000000..a4254feb7
--- /dev/null
+++ b/net-analyzer/unicornscan/Manifest
@@ -0,0 +1,3 @@
+AUX unicornscan-0.4.7-configure.patch 441 RMD160 6de3a99f931262bb023705532adfb3e123b89481 SHA1 b55923655d32838eeed2564812533aaf4f1b3d24 SHA256 88e7c584f3d5c14292d7e6670d59d8ff3183ae3aa4ab5d631128890779615d48
+DIST unicornscan-0.4.7-2.tar.bz2 3080498 RMD160 b257e49d4edf7689f2a2391a8c96112aaca46acf SHA1 5361150afa999e68076a453072830dd23dd9bfee SHA256 06c1e7f7471bcf6d34f0094b8fe4fa117dd945f91e0a0c1c2575e12465f0e2ec
+EBUILD unicornscan-0.4.7.ebuild 1670 RMD160 afa2ac654106d0d7d125840d3405bb823aad87ab SHA1 6b79769d58fc02e66be89db367c7f16977de2c8d SHA256 e1926bbcbd0a950e9653b82aba266e27e3b49c8fdc80dbd93cff85351a41ce12
diff --git a/net-analyzer/unicornscan/files/unicornscan-0.4.7-configure.patch b/net-analyzer/unicornscan/files/unicornscan-0.4.7-configure.patch
new file mode 100644
index 000000000..710131378
--- /dev/null
+++ b/net-analyzer/unicornscan/files/unicornscan-0.4.7-configure.patch
@@ -0,0 +1,20 @@
+--- configure	2008-09-30 12:20:05.000000000 +0200
++++ ../unicornscan-0.4.7/configure	2008-09-30 12:23:50.000000000 +0200
+@@ -25715,7 +25715,7 @@
+ # Check whether --with-libdnet was given.
+ if test "${with_libdnet+set}" = set; then
+   withval=$with_libdnet;
+-case "$dnet_pfx" in
++case "$withval" in
+ no)
+ 	lookin=""
+ 	;;
+@@ -25723,7 +25723,7 @@
+ 	lookin=$default_libdnet_directories
+ 	;;
+ *)
+-	lookin=$dnet_pfx
++	lookin=$withval
+ 	;;
+ esac
+ 
diff --git a/net-analyzer/unicornscan/unicornscan-0.4.7.ebuild b/net-analyzer/unicornscan/unicornscan-0.4.7.ebuild
new file mode 100644
index 000000000..54ea78918
--- /dev/null
+++ b/net-analyzer/unicornscan/unicornscan-0.4.7.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="A utility for information gathering or security auditing"
+HOMEPAGE="http://www.unicornscan.org"
+SRC_URI="http://www.unicornscan.org/releases/${P}-2.tar.bz2"
+
+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/libpq )"
+RDEPEND="httpd? ( dev-lang/php 
+				  www-servers/apache )"
+
+pkg_setup() {
+		if use httpd && ! built_with_use --missing true dev-lang/php apache2; then
+				eerror "The httpd USE flag for this package enables dependecies"
+				eerror "needed for the web based front end."
+				eerror "For this reason, you have to merge dev-lang/php"
+				eerror "with the apache2 USE flag enabled, or disable the httpd"
+				eerror "USE flag for this package."
+				die "Missing apache2 USE flag on dev-lang/php"
+		fi
+}
+
+src_unpack() {
+		unpack ${A}
+		cd "${S}"
+		epatch "${FILESDIR}/${P}-configure.patch"
+}
+
+src_compile() {
+		local myconf=""
+		
+		append-flags "-D_GNU_SOURCE"
+		
+		if use geoip ; then
+				myconf="--with-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
+		emake || die
+}
+
+pkg_preinst() {
+		enewgroup unicornscan
+		enewuser unicornscan -1 -1 -1 unicornscan
+}
+
+src_install() {
+		emake -j1 DESTDIR="${D}" install || die "Install failed"
+}