diff --git a/net-analyzer/upnpscan/Manifest b/net-analyzer/upnpscan/Manifest
index f99b83d1e..c079cc897 100644
--- a/net-analyzer/upnpscan/Manifest
+++ b/net-analyzer/upnpscan/Manifest
@@ -1,2 +1,2 @@
 DIST upnpscan-v0.4-src.tgz 309011 RMD160 ed32678ec25f2627a36d622cba8548bec87faf9e SHA1 d15125d147ef962107fc3f01b52160d50f0d8710 SHA256 0d41d63efcc9ed15133306d9996ec72a07ddb047552fca0ac417eeb412db045b
-EBUILD upnpscan-0.4-r1.ebuild 657 RMD160 456a30e2342d4313051f1ad2d58a55d71917cf80 SHA1 f96b6bb3194e4c2c5c04374c1aecbbaa2e187e27 SHA256 c699fe7be6dfbbdf780b81f2362ee3dd54f9c879564ca0831b46d77f4745f07d
+EBUILD upnpscan-0.4-r1.ebuild 710 RMD160 efa06e1fe6cdb0fbe482c2b4f102804851a5f422 SHA1 4b12daac2ef9e12fdc8cddbd99769453b9ef0e10 SHA256 c418540a70300a59d951993402ffb22a06056f422ce00b62809cb30e6fa21b43
diff --git a/net-analyzer/upnpscan/upnpscan-0.4-r1.ebuild b/net-analyzer/upnpscan/upnpscan-0.4-r1.ebuild
index b49689130..8b23cdfec 100644
--- a/net-analyzer/upnpscan/upnpscan-0.4-r1.ebuild
+++ b/net-analyzer/upnpscan/upnpscan-0.4-r1.ebuild
@@ -2,6 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /root/portage/net-analyzer/upnpscan/upnpscan-0.4.ebuild,v 1.1.1.1 2006/02/27 20:03:41 grimmlin Exp $
 
+EAPI=2
+
+WANT_AUTOMAKE="1.9"
+
+inherit autotools
+
 DESCRIPTION="Scans the network for UPNP capable devices"
 HOMEPAGE="http://www.cqure.net/wp/upnpscan/"
 SRC_URI="http://www.cqure.net/tools/${PN}-v${PV}-src.tgz"
@@ -16,14 +22,12 @@ RDEPEND=""
 
 S="${WORKDIR}"/${PN}
 
-src_compile() {
-	if use static
-	then
-		./configure || die
-	else
-		./configure --enable-static=no || die
-	fi
-	emake || die
+src_prepare() {
+	sed -i 's|\[:space:\]|[[:space:]]|g' configure || die
+}
+
+src_configure() {
+	econf $(use_enable static) || die
 }
 
 src_install () {