diff --git a/net-analyzer/armitage/Manifest b/net-analyzer/armitage/Manifest
index cbf5700c3..632304c37 100644
--- a/net-analyzer/armitage/Manifest
+++ b/net-analyzer/armitage/Manifest
@@ -1,2 +1,3 @@
 DIST armitage20130410.tgz 6242815 SHA256 8a205f36dddd553fc7c0a20c4fa353e595a326625b29dceb608cad2a8fd361af SHA512 e4d0f4372f4a698302d58bbb062b49a169a48cc3bcbce81f108d82687ecdb629207d8aff502ae3a7bec07ef65585c72eb03e889582e689cef8b5e5e6094fb857 WHIRLPOOL 06303ad6f73650b0838f81f3fa2d4680a9f5e1f3a885e6252e6cd5c717aaba69d79ee873bbbf6c0b7c67e1ace29fffe0beeeccd523d058837d409d4aa3cd1e04
+EBUILD armitage-20130410-r1.ebuild 937 SHA256 b52015f0fd98c07dc7813fb4bf3cd550a8e37ec8c83d3668fb7cce2427a7560b SHA512 ca4ced166cf4c50bb108c7a151d5799e742b80300556092a50f49cc4b86d5656f81e92c710bfdc2ecd813eaa5c6cb818fea3e9c5eb7bf6d30529c185fa76c481 WHIRLPOOL 2b48730974dbea52326e607eb7c4d148866b8fdd869e9e7d7772769c79b176bdd8d6cf370922ff328461b4c5de8f89e4a46549b2d9a23b34299c84ad9d35b69d
 EBUILD armitage-20130410.ebuild 611 SHA256 10d476f8cd4362cd31e3526c5e42565677a4a50f9376d68133f8cfae23bbd5b3 SHA512 c30c721b22b842f1d565478a35e633f88c430832e607c217ce8ccc6cce068d2d45c5e28e17d79009351d4548616034d3e2511eb77f1cbe2122f6d10167fd7ad0 WHIRLPOOL c03793f2a9101b00bc328314b8acce1f89c70d3d8bc69ea4647146956aa1f785b162babc0a9e4711b49818323d65617e8e4b3cd6174ffc66b73f3c7bbef718a6
diff --git a/net-analyzer/armitage/armitage-20130410-r1.ebuild b/net-analyzer/armitage/armitage-20130410-r1.ebuild
new file mode 100644
index 000000000..c511eac29
--- /dev/null
+++ b/net-analyzer/armitage/armitage-20130410-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Cyber Attack Management for Metasploit"
+HOMEPAGE="http://www.fastandeasyhacking.com/"
+SRC_URI="http://www.fastandeasyhacking.com/download/${PN}${PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+PDEPEND="net-analyzer/metasploit
+	net-analyzer/nmap
+	virtual/jre"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+
+	# use armitage dir for the .store file
+	sed -i -e "s:rm -f:mkdir ~/.armitage; rm -f:" teamserver
+	sed -i -e "s:./armitage.store:~/.armitage/armitage.store:" teamserver
+	sed -i -e "s:armitage.jar:/opt/armitage/armitage.jar:" teamserver
+
+	sed -i -e "s:armitage.jar:/opt/armitage/armitage.jar:" armitage
+}
+
+src_install() {
+	dobin armitage
+	dosbin teamserver
+	doicon armitage-logo.png
+	insinto /opt/armitage/
+	doins armitage.jar cortana.jar
+	dodoc readme.txt
+}