diff --git a/pentoo/pentoo-cracking/Manifest b/pentoo/pentoo-cracking/Manifest
index 3b8bb414a..79d538208 100644
--- a/pentoo/pentoo-cracking/Manifest
+++ b/pentoo/pentoo-cracking/Manifest
@@ -1,2 +1 @@
-EBUILD pentoo-cracking-2012.0.ebuild 956 SHA256 5ccaf51886f2154fff082ab52d39c327871d5b68ea4d3886c6b391ccf1e51c8c SHA512 3108c28011420919b6d39b6edbc599823cc8f0859a5e1a248b6a0f546d6c196589e52cecdf13552ad5484668327623fb098444089571af14e12d4c6e8b859dd7 WHIRLPOOL 449ed42bda80a9a95642b42396582f396a82e4b5f94f485195824a6a92ce519f74f53a5958abf325f3c63305ad1b6c8743e25b494340c927eba4bac8efdb8452
-EBUILD pentoo-cracking-2013.0.ebuild 1010 SHA256 369421328bc01c3f5d20d2e53774e1b3c4c9e681a8854465d67e7f1837402cea SHA512 49de897fd8aab4b21984d7b45052b5950b887afe0dd45b028aab727d1c028274af3d6ad6cad70f84caf2ffc606efcdc1d14f3315816556d0a29efc30891d89e0 WHIRLPOOL 06e63b0b03da13a87dd428ba180b13ca5e9b02c125af2de10d451184c97c15590956e5d73d71df2d329ca18ae0cf963896499bdff074827dbfbc887bd17c52bd
+EBUILD pentoo-cracking-2013-r1.ebuild 1016 SHA256 73dc27a3d3f32a28aadba7e109ac5048174122dc7f804ddb82a0aa9522595a2b SHA512 b22850f8359c8d9a227aaa9f064d3884965bc846d3b7dafa12e8a6e6756c33deb24b96f62ef89e37407d1b8423431389a7debcdd2f2ad3aa476a05ddc786659a WHIRLPOOL fae718733b7401b99eab7f2d0fd42636bb4d38614c9a8ebcb4f64ccfcff9149f75982e01166353fc98b02685097757df7705a510aaedec31ecb92b38898e032f
diff --git a/pentoo/pentoo-cracking/pentoo-cracking-2012.0.ebuild b/pentoo/pentoo-cracking/pentoo-cracking-2012.0.ebuild
deleted file mode 100644
index 81bed0095..000000000
--- a/pentoo/pentoo-cracking/pentoo-cracking-2012.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-KEYWORDS="-*"
-DESCRIPTION="Pentoo cracking meta ebuild"
-HOMEPAGE="http://www.pentoo.ch"
-SLOT="0"
-LICENSE="GPL"
-
-IUSE_VIDEO_CARDS="video_cards_fglrx video_cards_nvidia"
-IUSE="${IUSE_VIDEO_CARDS} livecd-stage1 cuda opencl"
-
-DEPEND=""
-
-RDEPEND="${DEPEND}
-	!livecd-stage1? ( app-crypt/pyrit
-		!arm? ( app-crypt/hashcat-gui )
-		video_cards_nvidia? ( app-crypt/cryptohaze-combined ) )
-	app-crypt/SIPcrack
-	!arm? ( app-crypt/chntpw )
-	app-crypt/johntheripper
-	app-crypt/ophcrack
-	app-dicts/raft-wordlists
-	app-text/cewl
-	net-analyzer/hydra
-	net-analyzer/medusa
-	net-analyzer/ncrack
-	net-analyzer/thc-pptp-bruter
-	net-misc/rdesktop-brute"
-
-#removed from stage2? because it doesn't build for me
-#	app-crypt/cuda-rarcrypt
-#	net-analyzer/authforce
-#	app-crypt/md5bf
-
-#stupid build system, doesn't work on hardened
-#		app-crypt/hashkill
-
diff --git a/pentoo/pentoo-cracking/pentoo-cracking-2013.0.ebuild b/pentoo/pentoo-cracking/pentoo-cracking-2013-r1.ebuild
similarity index 90%
rename from pentoo/pentoo-cracking/pentoo-cracking-2013.0.ebuild
rename to pentoo/pentoo-cracking/pentoo-cracking-2013-r1.ebuild
index cc7f20882..cea15304d 100644
--- a/pentoo/pentoo-cracking/pentoo-cracking-2013.0.ebuild
+++ b/pentoo/pentoo-cracking/pentoo-cracking-2013-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI="5"
 KEYWORDS=""
 DESCRIPTION="Pentoo cracking meta ebuild"
 HOMEPAGE="http://www.pentoo.ch"
@@ -15,10 +15,11 @@ IUSE="${IUSE_VIDEO_CARDS} livecd-stage1 cuda opencl"
 DEPEND=""
 
 RDEPEND="${DEPEND}
-	!livecd-stage1? ( app-crypt/pyrit
+	!livecd-stage1? (
 		!arm? ( app-crypt/hashcat-gui )
 		video_cards_nvidia? ( opencl? ( app-crypt/cryptohaze-combined )
-					cuda? ( app-crypt/cryptohaze-combined ) ) )
+					cuda? ( app-crypt/cryptohaze-combined
+						app-crypt/pyrit ) ) )
 	app-crypt/SIPcrack
 	!arm? ( app-crypt/chntpw )
 	app-crypt/johntheripper