diff --git a/dev-db/sqlmap/Manifest b/dev-db/sqlmap/Manifest
index a95ac4bd1..3c3f99c3e 100644
--- a/dev-db/sqlmap/Manifest
+++ b/dev-db/sqlmap/Manifest
@@ -1,3 +1,3 @@
 DIST sqlmap-0.9.tar.gz 6216924 SHA256 9c76666d0555620329d949aca87571825adb8fcda9cd564e6410e1d2b6228c55 SHA512 dd942bac5bbd8f979c431de63ce91155fb789b4a3cab0c3c86f16417e9aeff757c5dd57f98b4a4a0622e344351d57563f8e159ce1b51d763ea230f9301ff0a3d WHIRLPOOL 44822d35e0113d6caba8838c00d84a5879c500cc286f2e025198b66f9ad1ada195dfccf09630213e1b500acda9fe71d194baf5ab2d4f97ecd6a68c6e2454dacd
-EBUILD sqlmap-0.9-r2.ebuild 1774 SHA256 748b7df9e1785cfc7cf1f6f5e1a45cf41a3bdeaf15fe9cfed501a9d93cf38fac SHA512 c8b8529bea6bd7058bf055c760f69f876c9e57da82cc933e13c567c3611decf57038cd1be2e977d2be143b72b408aec2fc9efddbe7c74630333db745a26adff7 WHIRLPOOL 5a5758f448e0cc70c20c61e9e9dba7693b1d9a9c6a4cf8e6324f934f008cbb3acdad1698543f61413ccaca4d11e2fcb055223c4feb6254286bd079af43fa0777
-EBUILD sqlmap-9999.ebuild 2052 SHA256 a80ae35dd66ce5e23750cd5434a9dbb76f149f07a415c120bb2239b70c2d1e92 SHA512 f5d8218765a53313e1b52e2c7c4865764cd79a64366c8f6359b6fa057c57d7aaac44fa3941c15f0d0afa355956dfd1118070a30b9a4fece7a39e597ba53efa9e WHIRLPOOL 6bc42d3c332c1c6882836354444053af43b3c9d4df56f3bde4c304ff47f1b2f62c99140f3ba0270e0083128e697f5574b907f55cf43908960c50249b00f43dc3
+EBUILD sqlmap-0.9-r3.ebuild 1950 SHA256 734e3b157d34dfe8f251fe02ffb8c53a0865eaf0e1c600eee18a485f7a02b0d4 SHA512 e0394ebf5fbdb1a8abdb9b7ded9a7d982d3697d651eb6bb9b20b720f3bc04594a455c58351daf6a7319eac5494294d49635f176370d2797329472fd2ca8c6540 WHIRLPOOL 6144891b5fb881776b0cfc16d0b4856cdb7e590241993574e44dea06e1b7e9a48c09b5ef9eb362e13a69e7ef272ba51e7bb472c5d5ab7edcfe7af6e5129e8ee0
+EBUILD sqlmap-9999.ebuild 2228 SHA256 ec634d8ad0427dd0af14112797d37b0058f138c4d3304f2864ca384398d3bfb8 SHA512 e78b4db7238d940cbd8010f60fff40aa6abdbf69e1f16f9c90d26ebdb4df1a0f4d5e9e4fccc6cb783c5b8da1589cfc007c814d20eb9e4b3659796f9a288e1bbc WHIRLPOOL 31ff69fc4f013fb0f2483d1ff5edf2713f9f9b75420b89eaabf9ec8c215551e9889576ce007e871f2524029be9faaa17f081321b03ff3076ec0cdca9648815fe
diff --git a/dev-db/sqlmap/sqlmap-0.9-r2.ebuild b/dev-db/sqlmap/sqlmap-0.9-r3.ebuild
similarity index 88%
rename from dev-db/sqlmap/sqlmap-0.9-r2.ebuild
rename to dev-db/sqlmap/sqlmap-0.9-r3.ebuild
index 09011c73e..e06e245c3 100644
--- a/dev-db/sqlmap/sqlmap-0.9-r2.ebuild
+++ b/dev-db/sqlmap/sqlmap-0.9-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND=""
+RDEPEND="app-arch/upx-bin"
 
 QA_PRESTRIPPED="
 	/usr/share/${PN}/lib/contrib/upx/linux/upx
@@ -53,6 +53,12 @@ src_install () {
 	dodoc doc/* || die "failed to add docs"
 	rm -rf doc
 	dodir /usr/share/"${PN}"/
+
+	# Handle the upx binary
+	rm -rf lib/contrib
+	dodir /usr/share/"${PN}"/lib/contrib/upx/linux
+	dosym /opt/bin/upx /usr/share/"${PN}"/lib/contrib/upx/linux/upx
+
 	cp -R * "${D}"/usr/share/"${PN}"/
 	dosym /usr/share/"${PN}"/sqlmap.py /usr/sbin/sqlmap
 }
diff --git a/dev-db/sqlmap/sqlmap-9999.ebuild b/dev-db/sqlmap/sqlmap-9999.ebuild
index ad2e7b844..6bc00dce2 100644
--- a/dev-db/sqlmap/sqlmap-9999.ebuild
+++ b/dev-db/sqlmap/sqlmap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND=""
-RDEPEND=""
+RDEPEND="app-arch/upx-bin"
 
 QA_PRESTRIPPED="
 	/usr/share/${PN}/lib/contrib/upx/linux/upx
@@ -57,6 +57,12 @@ src_install () {
 	dodoc doc/* || die "failed to add docs"
 	rm -rf doc/
 	dodir /usr/share/"${PN}"/
+
+	# Handle the upx binary
+	rm -rf lib/contrib
+	dodir /usr/share/"${PN}"/lib/contrib/upx/linux
+	dosym /opt/bin/upx /usr/share/"${PN}"/lib/contrib/upx/linux/upx
+
 	cp -R * "${D}"/usr/share/"${PN}"/
 	dosym /usr/share/"${PN}"/sqlmap.py /usr/sbin/sqlmap
 }