diff --git a/app-crypt/cpyrit_cuda/Manifest b/app-crypt/cpyrit_cuda/Manifest
index 62423c2a2..885c97d81 100644
--- a/app-crypt/cpyrit_cuda/Manifest
+++ b/app-crypt/cpyrit_cuda/Manifest
@@ -1,2 +1,2 @@
-EBUILD cpyrit_cuda-0.3.ebuild 723 RMD160 e34d79b7801493bf35b6adede6701d44b20e8628 SHA1 c95067dfdedd871343a8e621219bb181a52588d6 SHA256 94ccfa77948cb4278771c8f9a23c407f72c9abbeb6af62b04e843647c2732259
+EBUILD cpyrit_cuda-0.3-r1.ebuild 706 RMD160 b89f9ca8f5865aedb655a3cc2528e94896f4b300 SHA1 078a2e80e8e2bd4965a6af0f447d54794019e799 SHA256 0ff35c2e55daced208ac1fe3daacbc7fed0321030966db2a311a890f1259db51
 EBUILD cpyrit_cuda-9999.ebuild 718 RMD160 e6fd60817c0a1cec9e3f2c7da60ae596a2b70495 SHA1 ec73c43a7992726fb183e8d4405517b121226166 SHA256 b6508e75f37fe37e74ba4fc0683b57fe9b7f6618e24976dec453dc4e6e942596
diff --git a/app-crypt/cpyrit_cuda/cpyrit_cuda-0.3.ebuild b/app-crypt/cpyrit_cuda/cpyrit_cuda-0.3-r1.ebuild
similarity index 83%
rename from app-crypt/cpyrit_cuda/cpyrit_cuda-0.3.ebuild
rename to app-crypt/cpyrit_cuda/cpyrit_cuda-0.3-r1.ebuild
index de1b0d381..ba8c84d1c 100644
--- a/app-crypt/cpyrit_cuda/cpyrit_cuda-0.3.ebuild
+++ b/app-crypt/cpyrit_cuda/cpyrit_cuda-0.3-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=2
 
-inherit eutils python distutils subversion
+inherit eutils python distutils subversion flag-o-matic
 
 DESCRIPTION="A GPU-based WPA-PSK and WPA2-PSK cracking tool"
 HOMEPAGE="http://code.google.com/p/pyrit/"
@@ -20,6 +20,10 @@ DEPEND="!<app-crypt/pyrit-0.3-r1
 	x11-drivers/nvidia-drivers"
 RDEPEND="${DEPEND}"
 
+pkg_setup() {
+	append-ldflags $(no-as-needed)
+}
+
 src_compile() {
 	cd "${S}/cpyrit_cuda"
 	distutils_src_compile
@@ -29,11 +33,3 @@ src_install() {
 	cd "${S}/cpyrit_cuda"
 	distutils_src_install
 }
-
-pkg_postinst() {
-	python_mod_optimize
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/app-crypt/cpyrit_opencl/Manifest b/app-crypt/cpyrit_opencl/Manifest
index c470eaff0..47427291a 100644
--- a/app-crypt/cpyrit_opencl/Manifest
+++ b/app-crypt/cpyrit_opencl/Manifest
@@ -1,4 +1,4 @@
 AUX cpyrit_opencl-0.3.patch 826 RMD160 62f810c2697cb3a2e6ea3dea565c9e6134c20d40 SHA1 b83721a565cb86ad5552fd2fdce23eaf1ef5c9c2 SHA256 4dd600140f6592f353dd96504b4381a32319a670ca168611a0f1d5e45a3c89c4
 AUX cpyrit_opencl-9999.patch 476 RMD160 3340ab0a46e6bcb814c72522fb638859a65906c7 SHA1 f1a1b4a0696551e4cb9566bec507dabc9eaef782 SHA256 bbfabe737e519d3bd177d09cec3384242e8035db2bf67ffafff89f6f344077d0
-EBUILD cpyrit_opencl-0.3.ebuild 801 RMD160 1dfb11b32f4e7fe53853ce98bad51b4c6eef43a0 SHA1 ab486c5618ba60e6d63b05939babf42b01fcb226 SHA256 75332d67b5fe1011f189a740e947fd40a88a724b1cc0d6a403d22970996db0dd
+EBUILD cpyrit_opencl-0.3-r1.ebuild 784 RMD160 445409a22ab3788841230478efa4bc245f3b479a SHA1 fa27a0b2ace4b98a9f3f7d20513457758c568eb6 SHA256 5d35bc1b601106df15dce17b3128f98d04b25dee87a106a777d1e554108441ec
 EBUILD cpyrit_opencl-9999.ebuild 729 RMD160 72524698f3519b4c3f7303070549bc2f0fa0c118 SHA1 95a5f79165a2d9bbd661f84fbe2b8c45a97b59c2 SHA256 7fa23fef99bd3611e4f3006d9b4d0e7427ae840646e55d656a42ec7b81421b88
diff --git a/app-crypt/cpyrit_opencl/cpyrit_opencl-0.3.ebuild b/app-crypt/cpyrit_opencl/cpyrit_opencl-0.3-r1.ebuild
similarity index 85%
rename from app-crypt/cpyrit_opencl/cpyrit_opencl-0.3.ebuild
rename to app-crypt/cpyrit_opencl/cpyrit_opencl-0.3-r1.ebuild
index e51113623..5f89a8ac1 100644
--- a/app-crypt/cpyrit_opencl/cpyrit_opencl-0.3.ebuild
+++ b/app-crypt/cpyrit_opencl/cpyrit_opencl-0.3-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=2
 
-inherit eutils python distutils subversion
+inherit eutils python distutils subversion flag-o-matic
 
 DESCRIPTION="A GPU-based WPA-PSK and WPA2-PSK cracking tool"
 HOMEPAGE="http://code.google.com/p/pyrit/"
@@ -22,6 +22,10 @@ DEPEND="!<app-crypt/pyrit-0.3-r1
 	>=x11-drivers/ati-drivers-10.0"
 RDEPEND="${DEPEND}"
 
+pkg_setup() {
+	append-ldflags $(no-as-needed)
+}
+
 src_compile() {
 	epatch "${FILESDIR}/${P}.patch"
 	cd "${S}/cpyrit_opencl"
@@ -32,11 +36,3 @@ src_install() {
 	cd "${S}/cpyrit_opencl"
 	distutils_src_install
 }
-
-pkg_postinst() {
-	python_mod_optimize
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/app-crypt/pyrit/Manifest b/app-crypt/pyrit/Manifest
index 74a5fc7e8..7247fb3b4 100644
--- a/app-crypt/pyrit/Manifest
+++ b/app-crypt/pyrit/Manifest
@@ -1,4 +1,4 @@
 AUX pyrit-0.3.patch 826 RMD160 62f810c2697cb3a2e6ea3dea565c9e6134c20d40 SHA1 b83721a565cb86ad5552fd2fdce23eaf1ef5c9c2 SHA256 4dd600140f6592f353dd96504b4381a32319a670ca168611a0f1d5e45a3c89c4
-EBUILD pyrit-0.3-r1.ebuild 798 RMD160 bfeb6eabfbae063ce1c1d8b6852da54f0270c25c SHA1 68ffc64e90c8ca1a511f0abbfbd05d1d40683df8 SHA256 b8b170b3001e5245d3736bb3508052847e7433efb671d12b7fcf31456eb6c910
+EBUILD pyrit-0.3-r2.ebuild 948 RMD160 7c23b12e95884794f8291f27baf09b6e31418f0e SHA1 f0c7a03bf06530d474d00ea4c0aee244095c3072 SHA256 b3b00f94a0fe226628daa7c6ec66126a6f5f3c95e0abec8f0a32d3e3c25a17a1
 EBUILD pyrit-0.3.ebuild 1148 RMD160 6cd54b5372655b703b0b61bb2487a8d705353795 SHA1 d89ba89e6b65d0df23c79349b6668546177c8cbb SHA256 8e850120842228177f41a6d6c2d3af65ef9bdf5562d8b3a6688b90d610184024
 EBUILD pyrit-9999.ebuild 885 RMD160 bc4f52a407a7d243eb3057943014864bf05e0e65 SHA1 4cf02bcbfdc8fb5fa94d23f4c1164e45044137e8 SHA256 7a84566012e3488daba97c7e8565e184bdce995f198229a2ac1a23eaa73c9861
diff --git a/app-crypt/pyrit/pyrit-0.3-r1.ebuild b/app-crypt/pyrit/pyrit-0.3-r2.ebuild
similarity index 75%
rename from app-crypt/pyrit/pyrit-0.3-r1.ebuild
rename to app-crypt/pyrit/pyrit-0.3-r2.ebuild
index 89b298e63..edeaf90b3 100644
--- a/app-crypt/pyrit/pyrit-0.3-r1.ebuild
+++ b/app-crypt/pyrit/pyrit-0.3-r2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=2
 
-inherit eutils python distutils subversion
+inherit eutils python distutils subversion flag-o-matic
 
 DESCRIPTION="A GPU-based WPA-PSK and WPA2-PSK cracking tool"
 HOMEPAGE="http://code.google.com/p/pyrit/"
@@ -23,6 +23,10 @@ DEPEND="!<app-crypt/pyrit-0.3-r1
 	cuda? (  ~app-crypt/cpyrit_cuda-0.3 )"
 RDEPEND="${DEPEND}"
 
+pkg_setup() {
+	append-ldflags $(no-as-needed)
+}
+
 src_compile() {
 	cd "${S}/pyrit"
 	distutils_src_compile
@@ -34,9 +38,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_mod_optimize
+	python_mod_optimize $(python_get_sitedir)/{pyrit_cli.py,cpyrit}
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	python_mod_cleanup $(python_get_sitedir)/{pyrit_cli.py,cpyrit}
 }