diff --git a/net-analyzer/set/Manifest b/net-analyzer/set/Manifest
index 4bb91011a..06ba4f50d 100644
--- a/net-analyzer/set/Manifest
+++ b/net-analyzer/set/Manifest
@@ -1,2 +1,2 @@
-AUX set 41 RMD160 d409a05d5764a3a017df12575924419b9438fc5c SHA1 e95fdf8e48af1b1c4bdfbe8443ade5d8da0a7e62 SHA256 61fa527c1906be500005f480446cdfe04e45e48e9ce1a7415e90570ff9f74a27
-EBUILD set-9999.ebuild 1979 RMD160 d1c2e650cb8c246e3979bd5eba1b4d7ed27ed721 SHA1 583c2f1109dfe4f1253e21282d8fcbaecb60d41b SHA256 c1a60d12f54b52667e393f9f7c58bb066108178ce3aaa8699b5ae7f3b952f572
+AUX set 41 SHA256 61fa527c1906be500005f480446cdfe04e45e48e9ce1a7415e90570ff9f74a27 SHA512 c517eef81963a486b3ef4e7a2d07c88ab3f6e85dc00ead372ee4a207a9e98b084da8dcb723762927322e159a3593bd8a8269613d63bb6ea07e381cdb682276f1 WHIRLPOOL 7b4e2eb82436b0397d8686e9401fe78d501855dd6f282f995baab524680b8b3585d9c05c49aa66ff318ab087aec5a319f2f2aeb839ce3a79850180afdee8d81d
+EBUILD set-9999.ebuild 2255 SHA256 a86dc1ecf5822155507f9cfcade36552762e1d52b17ff24e9c3977665dc9ed43 SHA512 5e3ab0eddffb1313f831ffbdd0daa5cfea7da0f0d7b9337f7799c9828455e6d1ce7a512183e294c2a397c4fb41fc27c2a4b10fd1ca4ca72e9cdd187071eb2f78 WHIRLPOOL 7b05320cdab0afe1297f3b9c714557891c16230cb46b28f4cd7b19f686710e5f73e6b3638927433898653f06087afbc0ef000bba56887593364b440985254ec6
diff --git a/net-analyzer/set/set-9999.ebuild b/net-analyzer/set/set-9999.ebuild
index 7eb5a5130..1fdc6e69a 100644
--- a/net-analyzer/set/set-9999.ebuild
+++ b/net-analyzer/set/set-9999.ebuild
@@ -1,22 +1,26 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: Exp $
 
-EAPI="2"
+EAPI="4"
 MY_P=${PN/set/social_engineering_toolkit}
 
-inherit subversion
+inherit git-2 multilib
 SRC_URI=""
-ESVN_REPO_URI="http://svn.secmaniac.com/${MY_P}"
-
+EGIT_REPO_URI="https://github.com/trustedsec/social-engineer-toolkit.git"
 DESCRIPTION="A social engineering framework"
-HOMEPAGE="http://www.secmaniac.com/"
+HOMEPAGE="https://www.trustedsec.com/downloads/social-engineer-toolkit/"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="ettercap"
 
+QA_PREBUILT="
+	usr/$(get_libdir)/set/src/payloads/ratte/ratteserver
+	usr/$(get_libdir)/set/src/payloads/set_payloads/shell.linux
+"
+
 # blocker on ruby-1.8.7:
 # http://spool.metasploit.com/pipermail/framework/2008-September/003671.html
 RDEPEND="virtual/jdk
@@ -46,22 +50,22 @@ src_compile() {
 
 src_install() {
 	# should be as simple as copying everything into the target...
-	dodir /usr/lib/${PN}
-	cp -R "${S}"/* "${D}"/usr/lib/${PN} || die "Copy files failed"
-	rm -Rf "${D}"/usr/lib/${PN}/readme
+	dodir /usr/$(get_libdir)/${PN}
+	cp -R "${S}"/* "${D}"/usr/$(get_libdir)/${PN} || die "Copy files failed"
+	rm -Rf "${D}"/usr/$(get_libdir)/${PN}/readme
 
 	#we don't need a dynamically compiled wget, we have that
-	rm -rf "${D}"/usr/lib/set/src/webattack/web_clone/linux
+	rm -rf "${D}"/usr/$(get_libdir)/set/src/webattack/web_clone/linux
 	#especially not for MacOSX
-	rm -rf "${D}"/usr/lib/set/src/webattack/web_clone/osx
+	rm -rf "${D}"/usr/$(get_libdir)/set/src/webattack/web_clone/osx
 
 	#remove more broken staticly compiled crap
-	rm -rf "${D}"/usr/lib/set/src/wireless/airbase-ng
-	rm -rf "${D}"/usr/lib/set/src/wireless/airmon-ng
+	rm -rf "${D}"/usr/$(get_libdir)/set/src/wireless/airbase-ng
+	rm -rf "${D}"/usr/$(get_libdir)/set/src/wireless/airmon-ng
 
 	dodir /usr/share/doc/${PF}
 	cp -R "${S}"/readme/* "${D}"/usr/share/doc/${PF}
-	dosym /usr/share/doc/${PF} /usr/lib/${PN}/readme
+	dosym /usr/share/doc/${PF} /usr/$(get_libdir)/${PN}/readme
 
 	newbin "${FILESDIR}"/set ${MY_P}