diff --git a/app-crypt/pyrit/Manifest b/app-crypt/pyrit/Manifest
index 85c3fb348..5610b3ac7 100644
--- a/app-crypt/pyrit/Manifest
+++ b/app-crypt/pyrit/Manifest
@@ -1,2 +1,3 @@
+AUX gentoo-64.patch 1846 RMD160 aa1e258f8a0d5d6354c9b211ec6214719a0ea781 SHA1 0cdd7ee6fc67e02cb55f633f514eb0944af5f5e6 SHA256 f9ebca6aafc6c1c20e0a80b72b8e91ba03478cf8179ab5dc68ace7cd7759e872
 AUX gentoo.patch 1834 RMD160 91769f58483d059fa9ca1223c3f314a44241033f SHA1 1c51b1e4518f5f969fa50b8956ecc3645fbe66a7 SHA256 54b80b091c732b9aedc166870554e9628fe1315622918dfa8de88fdd6db468c2
-EBUILD pyrit-9999.ebuild 966 RMD160 5d3871798711fdeae94f4e20b43cb5a957944e6d SHA1 32e19436d71be45024652479f46f83f295368e34 SHA256 38305ef96f65cc18793c64270b754506161004c8840ed7139062384f59a20532
+EBUILD pyrit-9999.ebuild 1166 RMD160 09283b7c5ba2b30cc7c2fcf13fe71f6e1296dcd5 SHA1 178f47bab50a37cd79a94cbfc26de74d6dc0fe83 SHA256 c5ec86cb2e1fb4a59ad146af16116321578f6e53b41d1479070f2e4c4320854b
diff --git a/app-crypt/pyrit/pyrit-9999.ebuild b/app-crypt/pyrit/pyrit-9999.ebuild
index eba67d71f..8ac032730 100644
--- a/app-crypt/pyrit/pyrit-9999.ebuild
+++ b/app-crypt/pyrit/pyrit-9999.ebuild
@@ -9,30 +9,55 @@ ESVN_REPO_URI="http://pyrit.googlecode.com/svn/trunk/"
 
 LICENSE="GPL-3"
 KEYWORDS="-*"
-IUSE="cuda stream"
+IUSE="cuda padlock stream"
 SLOT="0"
 DEPEND="stream? ( dev-util/amd-stream-sdk-bin )
 	cuda? ( dev-util/nvidia-cuda-sdk )"
 RDEPEND="${DEPEND}"
 
 src_compile() {
-	MYOPTS="HAVE_PADLOCK"
-	if use stream; then
-		MYOPTS="${MYOPTS} HAVE_STREAM"
+	MYOPTS=""
+	if use amd64; then
+		epatch "${FILESDIR}/gentoo-64.patch"
+		MY_ARCH="x86_64"
+	else
+		epatch "${FILESDIR}/gentoo.patch"
+		MY_ARCH="i686"
+	fi
+	cd cpyrit
+	if use padlock; then
+		python setup.py HAVE_PADLOCK build || die "Build padlock failed"
+		python setup.py clean
+		mv build/lib.linux-"${MY_ARCH}"-2.5  build/padlock
 	fi
 	if use cuda; then
-		MYOPTS="${MYOPTS} HAVE_CUDA"
+		python setup.py HAVE_CUDA build || die "Build cuda failed"
+		python setup.py clean
+		rm cpyrit_cuda.linkinfo
+		mv build/lib.linux-"${MY_ARCH}"-2.5  build/cuda
+	fi
+	if use stream; then
+		python setup.py HAVE_STREAM build || die "Build stream failed"
+		python setup.py clean
+		mv build/lib.linux-"${MY_ARCH}"-2.5  build/steam
 	fi
-
-	epatch "${FILESDIR}/gentoo.patch"
-	cd cpyrit
-	python setup.py ${MYOPTS} build || die "Build failed"
 }
 
 src_install() {
 	python_version
 	insinto /usr/lib/python"${PYVER}"/site-packages/
-	doins cpyrit/build/lib.linux-i686-2.5/*
+	if use padlock; then
+		cd "${S}"/build/padlock
+		sed -e '/import/ s/_cpyrit/_cpyrit_padlock as _cpyrit/' -i cpyrit.py
+		newins _cpyrit.so _cpyrit_padlock.so
+		newins cpyrit.py cpyrit_padlock.py
+		newsbin "${S}/pyrit.py" pyrit-padlock.py
+	fi
+	if use amd64; then
+		doins cpyrit/build/lib.linux-x86_64-2.5/*
+	else
+		doins cpyrit/build/lib.linux-i686-2.5/*
+	fi
 	dosbin pyrit.py
 }