diff --git a/app-exploits/packetstormexploits/Manifest b/app-exploits/packetstormexploits/Manifest
index b26ba26cc..2a0346700 100644
--- a/app-exploits/packetstormexploits/Manifest
+++ b/app-exploits/packetstormexploits/Manifest
@@ -20,6 +20,5 @@ DIST 2009-exploits.tgz 30341714 SHA256 eb89bbff95b8ba691b547a4614080e2038915ca73
 DIST 2010-exploits.tgz 27818896 SHA256 b82579a67964fa2f19e44e47fadc28efad6112ecc27bde8aa8934a93f1d0bbe0 SHA512 7a5433b6b4ab57c2dd2409b319eb62bf29a6245b67b66a22308c16b2f7668aacd9262a1a3e16e3bcc6ce9c0d2f5133411a55a70a658588197d8102044913e12f WHIRLPOOL a8c781a2dae5013c1162e74cd3c848ac5c39f789fe2b19a3e04058693ddf6024e2241e290cb3c475c3a0a8867a126f71bdf1c3ff46d3f67e24e70e62f242459a
 DIST 2011-exploits.tgz 45169164 SHA256 d289b09b2825205652e7ba4a0699cb0f5cdf2934b07df28338628241fc0d2c82 SHA512 0b5cf90ed53d9dca9e36ef354436424f78e4527d2ce85d645b5b42beaee735a7653fd41a1033eadd5a5a4f03c0e8c4b6c6f21a45114166283a5d3b87795698ae WHIRLPOOL 2c29c051d763e71116f82abb9f06edc3f807df31fe4e1e4204b100cce1d61ce4ef89f11e76c1a42002bfadff690373a5539bc3c09f689195fbd13ecf9e9cf90a
 DIST 2012-exploits.tgz 99377239 SHA256 fff9bb87076aec51b411ee266d2877f3b5e72a7aae421e84e40d00b53e62f4c7 SHA512 d072b454492d548a8492edb64808be6c83c284f36fb28929ea29ceb74085f76290c66920b0f1789fd08667c014ad5fab5716b21916a92296bb3313a35ef2f97e WHIRLPOOL 56e48e46c1610d9f2560cebdecc3c80db63ca7b402b11bc3b83b118c5314b4f0705d768bf485b536e50dcaa7be06422ae590c5cccff399f8c874cd394702262d
-EBUILD packetstormexploits-2013.06.ebuild 2164 SHA256 b5261d1324b541a6f050c75e77190c15183b62b2bd06839bdddeb5d3f798075e SHA512 9e8bcc2d4dc00f0793a2814c99b274335b09a08f3ef849d0735823fa52319a54590921fc1781b69c76ef414446c25fd6a3178676d07a66459a250d280d55d348 WHIRLPOOL 1a03cfa8c4cf2163b042bb41228b3251aeac022a4ec2a1ce63381eff86a5ab955c56ab5d019526d62b8168a3d074ecc85e412e7d57cb48a9853d7897033d8f66
-EBUILD packetstormexploits-2013.07.ebuild 2164 SHA256 b5261d1324b541a6f050c75e77190c15183b62b2bd06839bdddeb5d3f798075e SHA512 9e8bcc2d4dc00f0793a2814c99b274335b09a08f3ef849d0735823fa52319a54590921fc1781b69c76ef414446c25fd6a3178676d07a66459a250d280d55d348 WHIRLPOOL 1a03cfa8c4cf2163b042bb41228b3251aeac022a4ec2a1ce63381eff86a5ab955c56ab5d019526d62b8168a3d074ecc85e412e7d57cb48a9853d7897033d8f66
-EBUILD packetstormexploits-2013.08.ebuild 2164 SHA256 b5261d1324b541a6f050c75e77190c15183b62b2bd06839bdddeb5d3f798075e SHA512 9e8bcc2d4dc00f0793a2814c99b274335b09a08f3ef849d0735823fa52319a54590921fc1781b69c76ef414446c25fd6a3178676d07a66459a250d280d55d348 WHIRLPOOL 1a03cfa8c4cf2163b042bb41228b3251aeac022a4ec2a1ce63381eff86a5ab955c56ab5d019526d62b8168a3d074ecc85e412e7d57cb48a9853d7897033d8f66
+EBUILD packetstormexploits-2012.13.ebuild 1858 SHA256 293e1a54359fb34cbefe69bed50af95d6428576f91a6632f0b6c5c7fdf550e25 SHA512 14b81afd8fe80b3d34946c776db38e99056e8b3c19ddbf989827f83ac1130da5ce7f1bac5aaa912abf660d1217cf1abc2b6b6733b1683279e3e9ea956198f0ea WHIRLPOOL 0f07ad9444ee230da6bd4d7ccbe75875a4dad140ac1b96e59b919e5c9853374035dc88d66c0fe25420c9dfff2fbcc12db7e8e00137f4a57e2a563db98654b676
+EBUILD packetstormexploits-2013.08-r1.ebuild 688 SHA256 4228ab2cdcdf2b693adb03869d53abae24163fbc2b677ab2d8776108c634c1eb SHA512 37a5080b8fecdb895f7d7c97d65e0b40e5577ec05f08f998a1386c8a0d18114e98bebea266982740a3bc3ad7d6f9af9ecf8ac87b33c7a35e7828179bad0eed2b WHIRLPOOL 5fbee327ed7aed28aaf43475b4b743b94bc31338fb933d7b1fc03d08b06700356cfa6ca50a183bd7259053d2c07bea763f4b65963fbbe7e0b5cec70eded38d42
diff --git a/app-exploits/packetstormexploits/packetstormexploits-2012.13.ebuild b/app-exploits/packetstormexploits/packetstormexploits-2012.13.ebuild
new file mode 100644
index 000000000..ef70c6345
--- /dev/null
+++ b/app-exploits/packetstormexploits/packetstormexploits-2012.13.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="Archive of packetstorm exploits"
+HOMEPAGE="http://packetstormsecurity.net"
+IUSE="1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 +2009 +2010 +2011 +2012"
+
+#Use yearly archivers
+SRC_URI="1999? ( http://dl.packetstormsecurity.net/9912-exploits/1999-exploits.tgz )
+	2000? ( http://dl.packetstormsecurity.net/0012-exploits/2000-exploits.tgz )
+	2001? ( http://dl.packetstormsecurity.net/0112-exploits/2001-exploits.tgz )
+	2002? ( http://dl.packetstormsecurity.net/0212-exploits/2002-exploits.tgz )
+	2003? ( http://dl.packetstormsecurity.net/0312-exploits/2003-exploits.tgz )
+	2004? ( http://dl.packetstormsecurity.net/0412-exploits/2004-exploits.tgz )
+	2005? ( http://dl.packetstormsecurity.net/0512-exploits/2005-exploits.tgz )
+	2006? ( http://dl.packetstormsecurity.net/0612-exploits/2006-exploits.tgz )
+	2007? ( http://dl.packetstormsecurity.net/0712-exploits/2007-exploits.tgz )
+	2008? ( http://dl.packetstormsecurity.net/0812-exploits/2008-exploits.tgz )
+	2009? ( http://dl.packetstormsecurity.net/0912-exploits/2009-exploits.tgz )
+	2010? ( http://dl.packetstormsecurity.net/1012-exploits/2010-exploits.tgz )
+	2011? ( http://dl.packetstormsecurity.net/1112-exploits/2011-exploits.tgz )
+	2012? ( http://dl.packetstormsecurity.net/1212-exploits/2012-exploits.tgz )"
+
+LICENSE="HPND"
+SLOT="2012"
+KEYWORDS="amd64 x86 arm"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/share/exploits/packetstormexploits/0001-exploits/bnc246
+		/usr/share/exploits/packetstormexploits/0212-exploits/kadmin
+		/usr/share/exploits/packetstormexploits/9902-exploits/SDI-lsof
+		/usr/share/exploits/packetstormexploits/0204-exploits/7350fun"
+
+src_install() {
+	insinto /usr/share/exploits/${PN}/
+	doins -r * || die "install failed"
+}
diff --git a/app-exploits/packetstormexploits/packetstormexploits-2013.06.ebuild b/app-exploits/packetstormexploits/packetstormexploits-2013.06.ebuild
deleted file mode 100644
index d80032203..000000000
--- a/app-exploits/packetstormexploits/packetstormexploits-2013.06.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit versionator
-
-AVC=( $(get_version_components) )
-MY_PV_YYYY=${AVC[0]}
-MY_PV_MM=${AVC[1]}
-
-DESCRIPTION="Archive of packetstorm exploits"
-HOMEPAGE="http://packetstorm.wowhacker.com/"
-IUSE="1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 +2009 +2010
-+2011 +2012 +2013"
-SRC_URI="1999? ( http://packetstorm.wowhacker.com/9912-exploits/1999-exploits.tgz )
-	2000? ( http://packetstorm.wowhacker.com/0012-exploits/2000-exploits.tgz )
-	2001? ( http://packetstorm.wowhacker.com/0112-exploits/2001-exploits.tgz )
-	2002? ( http://packetstorm.wowhacker.com/0212-exploits/2002-exploits.tgz )
-	2003? ( http://packetstorm.wowhacker.com/0312-exploits/2003-exploits.tgz )
-	2004? ( http://packetstorm.wowhacker.com/0412-exploits/2004-exploits.tgz )
-	2005? ( http://packetstorm.wowhacker.com/0512-exploits/2005-exploits.tgz )
-	2006? ( http://packetstorm.wowhacker.com/0612-exploits/2006-exploits.tgz )
-	2007? ( http://packetstorm.wowhacker.com/0712-exploits/2007-exploits.tgz )
-	2008? ( http://packetstorm.wowhacker.com/0812-exploits/2008-exploits.tgz )
-	2009? ( http://packetstorm.wowhacker.com/0912-exploits/2009-exploits.tgz )
-	2010? ( http://packetstorm.wowhacker.com/1012-exploits/2010-exploits.tgz )
-	2011? ( http://packetstorm.wowhacker.com/1112-exploits/2011-exploits.tgz )
-	2012? ( http://packetstorm.wowhacker.com/1212-exploits/2012-exploits.tgz )"
-
-	# a little hack for easier bump
-	SRC_URI="${SRC_URI} 2013? ("
-		for MY_M in $(eval echo "{1..$MY_PV_MM}"); do
-			SRC_URI="${SRC_URI}  http://packetstorm.wowhacker.com/13${MY_M}-exploits/13${MY_M}-exploits.tgz"
-		done
-	SRC_URI="${SRC_URI} )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 x86 arm"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/share/exploits/packetstormexploits/0001-exploits/bnc246
-		/usr/share/exploits/packetstormexploits/0212-exploits/kadmin
-		/usr/share/exploits/packetstormexploits/9902-exploits/SDI-lsof
-		/usr/share/exploits/packetstormexploits/0204-exploits/7350fun"
-
-src_install() {
-	insinto /usr/share/exploits/$PN
-	doins -r * || die "install failed"
-}
diff --git a/app-exploits/packetstormexploits/packetstormexploits-2013.07.ebuild b/app-exploits/packetstormexploits/packetstormexploits-2013.07.ebuild
deleted file mode 100644
index d80032203..000000000
--- a/app-exploits/packetstormexploits/packetstormexploits-2013.07.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit versionator
-
-AVC=( $(get_version_components) )
-MY_PV_YYYY=${AVC[0]}
-MY_PV_MM=${AVC[1]}
-
-DESCRIPTION="Archive of packetstorm exploits"
-HOMEPAGE="http://packetstorm.wowhacker.com/"
-IUSE="1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 +2009 +2010
-+2011 +2012 +2013"
-SRC_URI="1999? ( http://packetstorm.wowhacker.com/9912-exploits/1999-exploits.tgz )
-	2000? ( http://packetstorm.wowhacker.com/0012-exploits/2000-exploits.tgz )
-	2001? ( http://packetstorm.wowhacker.com/0112-exploits/2001-exploits.tgz )
-	2002? ( http://packetstorm.wowhacker.com/0212-exploits/2002-exploits.tgz )
-	2003? ( http://packetstorm.wowhacker.com/0312-exploits/2003-exploits.tgz )
-	2004? ( http://packetstorm.wowhacker.com/0412-exploits/2004-exploits.tgz )
-	2005? ( http://packetstorm.wowhacker.com/0512-exploits/2005-exploits.tgz )
-	2006? ( http://packetstorm.wowhacker.com/0612-exploits/2006-exploits.tgz )
-	2007? ( http://packetstorm.wowhacker.com/0712-exploits/2007-exploits.tgz )
-	2008? ( http://packetstorm.wowhacker.com/0812-exploits/2008-exploits.tgz )
-	2009? ( http://packetstorm.wowhacker.com/0912-exploits/2009-exploits.tgz )
-	2010? ( http://packetstorm.wowhacker.com/1012-exploits/2010-exploits.tgz )
-	2011? ( http://packetstorm.wowhacker.com/1112-exploits/2011-exploits.tgz )
-	2012? ( http://packetstorm.wowhacker.com/1212-exploits/2012-exploits.tgz )"
-
-	# a little hack for easier bump
-	SRC_URI="${SRC_URI} 2013? ("
-		for MY_M in $(eval echo "{1..$MY_PV_MM}"); do
-			SRC_URI="${SRC_URI}  http://packetstorm.wowhacker.com/13${MY_M}-exploits/13${MY_M}-exploits.tgz"
-		done
-	SRC_URI="${SRC_URI} )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 x86 arm"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/share/exploits/packetstormexploits/0001-exploits/bnc246
-		/usr/share/exploits/packetstormexploits/0212-exploits/kadmin
-		/usr/share/exploits/packetstormexploits/9902-exploits/SDI-lsof
-		/usr/share/exploits/packetstormexploits/0204-exploits/7350fun"
-
-src_install() {
-	insinto /usr/share/exploits/$PN
-	doins -r * || die "install failed"
-}
diff --git a/app-exploits/packetstormexploits/packetstormexploits-2013.08-r1.ebuild b/app-exploits/packetstormexploits/packetstormexploits-2013.08-r1.ebuild
new file mode 100644
index 000000000..c15d1384c
--- /dev/null
+++ b/app-exploits/packetstormexploits/packetstormexploits-2013.08-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit versionator
+
+AVC=( $(get_version_components) )
+MY_PV_YYYY=${AVC[0]}
+MY_PV_MM=${AVC[1]}
+
+DESCRIPTION="Archive of packetstorm exploits"
+HOMEPAGE="http://packetstormsecurity.net"
+IUSE=""
+
+#Use monthly archivers
+SRC_URI=""
+for MY_M in $(eval echo "{1..$MY_PV_MM}"); do
+	SRC_URI="${SRC_URI}  http://dl.packetstormsecurity.net/13${MY_M}-exploits/13${MY_M}-exploits.tgz"
+done
+
+LICENSE="HPND"
+SLOT="2013"
+KEYWORDS="amd64 x86 arm"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/exploits/${PN}/
+	doins -r * || die "install failed"
+}
diff --git a/app-exploits/packetstormexploits/packetstormexploits-2013.08.ebuild b/app-exploits/packetstormexploits/packetstormexploits-2013.08.ebuild
deleted file mode 100644
index d80032203..000000000
--- a/app-exploits/packetstormexploits/packetstormexploits-2013.08.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit versionator
-
-AVC=( $(get_version_components) )
-MY_PV_YYYY=${AVC[0]}
-MY_PV_MM=${AVC[1]}
-
-DESCRIPTION="Archive of packetstorm exploits"
-HOMEPAGE="http://packetstorm.wowhacker.com/"
-IUSE="1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 +2009 +2010
-+2011 +2012 +2013"
-SRC_URI="1999? ( http://packetstorm.wowhacker.com/9912-exploits/1999-exploits.tgz )
-	2000? ( http://packetstorm.wowhacker.com/0012-exploits/2000-exploits.tgz )
-	2001? ( http://packetstorm.wowhacker.com/0112-exploits/2001-exploits.tgz )
-	2002? ( http://packetstorm.wowhacker.com/0212-exploits/2002-exploits.tgz )
-	2003? ( http://packetstorm.wowhacker.com/0312-exploits/2003-exploits.tgz )
-	2004? ( http://packetstorm.wowhacker.com/0412-exploits/2004-exploits.tgz )
-	2005? ( http://packetstorm.wowhacker.com/0512-exploits/2005-exploits.tgz )
-	2006? ( http://packetstorm.wowhacker.com/0612-exploits/2006-exploits.tgz )
-	2007? ( http://packetstorm.wowhacker.com/0712-exploits/2007-exploits.tgz )
-	2008? ( http://packetstorm.wowhacker.com/0812-exploits/2008-exploits.tgz )
-	2009? ( http://packetstorm.wowhacker.com/0912-exploits/2009-exploits.tgz )
-	2010? ( http://packetstorm.wowhacker.com/1012-exploits/2010-exploits.tgz )
-	2011? ( http://packetstorm.wowhacker.com/1112-exploits/2011-exploits.tgz )
-	2012? ( http://packetstorm.wowhacker.com/1212-exploits/2012-exploits.tgz )"
-
-	# a little hack for easier bump
-	SRC_URI="${SRC_URI} 2013? ("
-		for MY_M in $(eval echo "{1..$MY_PV_MM}"); do
-			SRC_URI="${SRC_URI}  http://packetstorm.wowhacker.com/13${MY_M}-exploits/13${MY_M}-exploits.tgz"
-		done
-	SRC_URI="${SRC_URI} )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 x86 arm"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/share/exploits/packetstormexploits/0001-exploits/bnc246
-		/usr/share/exploits/packetstormexploits/0212-exploits/kadmin
-		/usr/share/exploits/packetstormexploits/9902-exploits/SDI-lsof
-		/usr/share/exploits/packetstormexploits/0204-exploits/7350fun"
-
-src_install() {
-	insinto /usr/share/exploits/$PN
-	doins -r * || die "install failed"
-}
diff --git a/pentoo/pentoo-exploit/Manifest b/pentoo/pentoo-exploit/Manifest
index f1b0fc245..7a9e74349 100644
--- a/pentoo/pentoo-exploit/Manifest
+++ b/pentoo/pentoo-exploit/Manifest
@@ -1,3 +1 @@
-EBUILD pentoo-exploit-2013.1-r1.ebuild 651 SHA256 48cedc96f684ea6403084d775ebb4aa2274fee3758e11590bccf3ddf45f1e4cb SHA512 44b81f8789f87d1e290807ff6b7d24f07f2cb3a66ab44b9192c76615a8e8616f341b75e50cbd6b50b8c7344f2e61f32f4b3579ec493cd3bea2d045e163fe98f5 WHIRLPOOL b6cc12da73e074735a62398636f539b924886331ec632b3f5f5c84af7ebb7f3a7d55563b145321331bfd48aeb0fce12b6927559d171309d21788d41cc19a9d91
-EBUILD pentoo-exploit-2013.1-r2.ebuild 628 SHA256 fa80713057734f22c346416018e067c760a1056079a106bb24275db75b584dc8 SHA512 56c9c54970acea44ce7fb6a2509d4561a5f880cb83289fdc70e5dd7e7c0164ea7fc237dbe47bf1f8117b50459100d6fc8d5b61aad105793b9cc087fed61b1615 WHIRLPOOL dcc2d154b9585da8c4835570acf45a2af09b06c7af99cd8900c4c7575b6ebad6ec1a748d16b0cd0fa3403457b807a43bb3691a5801c2b0be67a1f2e5fc7739a9
-EBUILD pentoo-exploit-2013.1.ebuild 636 SHA256 9835ab58e194e41e4e7a4c28d1ffe6b9ba01c168593fe7ec14b65eb2073438ce SHA512 564dedd257397e4c995cfff3bc5ea6c12ddab5302ed8a1c376dcf04795faaf3d06830392b3739e7db3070dfdcbac8e02a6515a475c222753e9c32d32945292c5 WHIRLPOOL 16f5ab16ccf934fb7fcd8d9c3d21eb5d69a40f546905a9de2fed54c2cb99f7c4080125e3aa419c23c1355207f525c9a61b856419aea98094432364291493ba1f
+EBUILD pentoo-exploit-2013.1-r3.ebuild 786 SHA256 bbbd4ba07a1e7f83f3cbbd645c84e513ede37a7b8a7117ff42bbe786112b4976 SHA512 4565d5a1e546faebf03ec756d5adeae9ffa5505ff195175906701e78cfc8322254648c38d051fd36f3e3da4a5bb7f3258735f0b96532e87e883cdc9a039d6c39 WHIRLPOOL c606eb588b3f030be50ad2cbd19c95506b8bf7651934fa49425db79d26ad6e4168da685ac66447efb5eb4dee42e7f3b7e9ced08c7af6472190475921d4cf20cf
diff --git a/pentoo/pentoo-exploit/pentoo-exploit-2013.1-r1.ebuild b/pentoo/pentoo-exploit/pentoo-exploit-2013.1-r1.ebuild
deleted file mode 100644
index 0606034a1..000000000
--- a/pentoo/pentoo-exploit/pentoo-exploit-2013.1-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-KEYWORDS="~amd64 ~x86"
-DESCRIPTION="Pentoo exploit meta ebuild"
-HOMEPAGE="http://www.pentoo.ch"
-SLOT="0"
-LICENSE="GPL-3"
-IUSE="java livecd"
-
-DEPEND=""
-
-RDEPEND="${DEPEND}
-	!livecd? ( app-exploits/packetstormexploits app-exploits/exploitdb )
-	app-exploits/shellstorm
-	app-forensics/make-pdf
-	java? ( net-analyzer/armitage )
-	net-analyzer/davtest
-	net-analyzer/inguma
-	net-analyzer/metasploit
-	net-analyzer/set
-	net-analyzer/upnpwn
-	net-analyzer/w3af
-	net-analyzer/yersinia
-	net-fs/winexe
-	net-misc/raccess
-	www-apps/beef"
diff --git a/pentoo/pentoo-exploit/pentoo-exploit-2013.1-r2.ebuild b/pentoo/pentoo-exploit/pentoo-exploit-2013.1-r3.ebuild
similarity index 70%
rename from pentoo/pentoo-exploit/pentoo-exploit-2013.1-r2.ebuild
rename to pentoo/pentoo-exploit/pentoo-exploit-2013.1-r3.ebuild
index b731bad8d..525813b24 100644
--- a/pentoo/pentoo-exploit/pentoo-exploit-2013.1-r2.ebuild
+++ b/pentoo/pentoo-exploit/pentoo-exploit-2013.1-r3.ebuild
@@ -13,7 +13,9 @@ IUSE="java livecd"
 DEPEND=""
 
 RDEPEND="${DEPEND}
-	!livecd? ( app-exploits/packetstormexploits app-exploits/exploitdb )
+	!livecd? ( app-exploits/packetstormexploits:2012
+		app-exploits/packetstormexploits:2013
+		 )
 	app-exploits/shellstorm
 	app-forensics/make-pdf
 	java? ( net-analyzer/armitage )
@@ -26,3 +28,6 @@ RDEPEND="${DEPEND}
 	net-fs/winexe
 	net-misc/raccess
 	www-apps/beef"
+
+# the 9999 svn version takes really long time to install. Removing it, until there is a better way to do it
+#app-exploits/exploitdb
diff --git a/pentoo/pentoo-exploit/pentoo-exploit-2013.1.ebuild b/pentoo/pentoo-exploit/pentoo-exploit-2013.1.ebuild
deleted file mode 100644
index 504d8f44a..000000000
--- a/pentoo/pentoo-exploit/pentoo-exploit-2013.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-KEYWORDS="~amd64 ~x86"
-DESCRIPTION="Pentoo exploit meta ebuild"
-HOMEPAGE="http://www.pentoo.ch"
-SLOT="0"
-LICENSE="GPL-3"
-IUSE="livecd"
-
-DEPEND=""
-
-RDEPEND="${DEPEND}
-	!livecd? ( app-exploits/packetstormexploits app-exploits/exploitdb )
-	app-exploits/shellstorm
-	app-forensics/make-pdf
-	net-analyzer/armitage
-	net-analyzer/davtest
-	net-analyzer/inguma
-	net-analyzer/metasploit
-	net-analyzer/set
-	net-analyzer/upnpwn
-	net-analyzer/w3af
-	net-analyzer/yersinia
-	net-fs/winexe
-	net-misc/raccess
-	www-apps/beef"