diff --git a/net-analyzer/armitage/Manifest b/net-analyzer/armitage/Manifest
deleted file mode 100644
index 25a91699e..000000000
--- a/net-analyzer/armitage/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST armitage022211.tgz 3281467 RMD160 24d3a1cb19371a304d3cdf29e08feb3ccd1bda01 SHA1 c2f736501178eb546977c8c3b4c634ac4877bbab SHA256 f767af2acb272bbb54f568be27ef48924b5497ea48b41a07c674638f4c695dc3
-DIST armitage022511.tgz 3182000 RMD160 5d99005e774a5bd8bc5de411a0482a3413c8eafb SHA1 6a6d065a2572a3af9e6091de6e69b188cb199051 SHA256 c15f1c5df16683d6e5dc3cdf7ca93b584d373130c7694eed5c907b0cbde92c51
-EBUILD armitage-11.02.22.ebuild 939 RMD160 5d335cd6de6fe3ee5d301ce4924c409e9e8d5a47 SHA1 17cd8174a304fa688d6f1ba9bb5461d691636936 SHA256 793fb150c7b25bc34f0a16655b2f69458625451e1df7ee71b0db68fac3cfcb90
-EBUILD armitage-11.02.25.ebuild 950 RMD160 d440f6c7b65d56de2eaf94f2cc0090ab75c325cf SHA1 f391a651111171df4ddecbc5d40918912128fa9f SHA256 3035c6fb8dc0f91fd39e20c0003d81b0ad17c519d91ea483d53811bbd841424b
diff --git a/net-analyzer/armitage/armitage-11.02.22.ebuild b/net-analyzer/armitage/armitage-11.02.22.ebuild
deleted file mode 100644
index 47deff09c..000000000
--- a/net-analyzer/armitage/armitage-11.02.22.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /root/portage/net-proxy/burpproxy/burpproxy-1.3_beta.ebuild,v 1.1.1.1 2006/02/27 20:03:41 grimmlin Exp $
-
-EAPI=2
-
-inherit versionator
-
-AVC=( $(get_version_components) )
-
-MY_P="${PN}${AVC[1]}${AVC[2]}${AVC[0]}"
-
-DESCRIPTION="A graphical cyber attack management tool for Metasploit"
-HOMEPAGE="http://www.fastandeasyhacking.com/"
-SRC_URI="http://www.fastandeasyhacking.com/download/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="virtual/jre
-	net-analyzer/metasploit[postgres]
-	net-analyzer/nmap"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	mkdir -p "${D}"/opt/${PN}
-	cp -a ${PN}.jar "${D}"/opt/${PN}
-	cp -a ${PN}-logo.png "${D}"/opt/${PN}
-	dodoc *.txt
-	echo -e "#!/bin/sh \njava -jar -Xmx256m /opt/${PN}/${PN}.jar\n" > "${PN}"
-	dobin ${PN}
-}
diff --git a/net-analyzer/armitage/armitage-11.02.25.ebuild b/net-analyzer/armitage/armitage-11.02.25.ebuild
deleted file mode 100644
index 42e33bb15..000000000
--- a/net-analyzer/armitage/armitage-11.02.25.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /root/portage/net-proxy/burpproxy/burpproxy-1.3_beta.ebuild,v 1.1.1.1 2006/02/27 20:03:41 grimmlin Exp $
-
-EAPI=2
-
-inherit versionator
-
-AVC=( $(get_version_components) )
-
-MY_P="${PN}${AVC[1]}${AVC[2]}${AVC[0]}"
-
-DESCRIPTION="A graphical cyber attack management tool for Metasploit"
-HOMEPAGE="http://www.fastandeasyhacking.com/"
-SRC_URI="http://www.fastandeasyhacking.com/download/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="virtual/jre
-	net-analyzer/metasploit[postgres]
-	net-analyzer/nmap"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	mkdir -p "${D}"/opt/${PN}
-	cp -a ${PN}.jar "${D}"/opt/${PN}
-	cp -a ${PN}-logo.png "${D}"/opt/${PN}
-	dodoc *.txt
-	echo -e "#!/bin/sh \n\njava -Xmx256m -jar /opt/${PN}/${PN}.jar \$* test\n" > "${PN}"
-	dobin ${PN}
-}
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index a02cd35df..0f7aea99c 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,3 +1,3 @@
 AUX msfrpcd3.confd 440 RMD160 67e569204d77592e8b0e19d34d87c0c75a722687 SHA1 ff1eea41295270d0b5117ee233b5f5fe44a84834 SHA256 f1148f3f4fe24b2689d6a8f3d8510031f493100a5b48823c0a5bc2085a6439b4
 AUX msfrpcd3.initd 561 RMD160 e9811489784131c4c1e68279d43b4f2ba4c093b1 SHA1 38240c3bba090011c25fffe90d9c898e540ba463 SHA256 89a897977b53a471334caa47eeadcb5595fa783bfafd99c7ae1d5c8f9e7041bc
-EBUILD metasploit-9999.ebuild 3439 RMD160 e0d3330c46eceb633f1bd689582676cdcbe2d52d SHA1 e402e3001d9e1f56e158b50fd3833bf18d16e702 SHA256 db1b8cb8eb64f00104ed9014104596bcf824c4faf46f3422d4f579f77e0450c4
+EBUILD metasploit-9999.ebuild 3653 RMD160 17647ef519035ed287b5c89c92338ec7f1d95b05 SHA1 43c3b614fc724eca83d69916c6242c9f1f10142d SHA256 6a60c17bba68dbb19204fb515dc92012f1a13a4a6326fc4bf945ecc650a619a0
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 31f8381be..bfe33b902 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.metasploit.org/"
 LICENSE="MSF-1.2"
 SLOT="3"
 KEYWORDS="amd64 arm ppc ~sparc x86"
-IUSE="sqlite postgres"
+IUSE="armitage sqlite postgres"
 
 # blocker on ruby-1.8.7:
 # http://spool.metasploit.com/pipermail/framework/2008-September/003671.html
@@ -31,7 +31,8 @@ RDEPEND="dev-lang/ruby
 	sqlite? ( dev-ruby/sqlite3-ruby
 		dev-ruby/activerecord )
 	postgres? ( dev-ruby/pg
-		dev-ruby/activerecord )"
+		dev-ruby/activerecord )
+	armitage? ( net-analyzer/nmap ) "
 #	 dev-ruby/ruby-postgres
 DEPEND=""
 
@@ -61,6 +62,12 @@ src_install() {
 		|| die "newinitd failed"
 	newconfd "${FILESDIR}"/msfrpcd${SLOT}.confd msfrpcd${SLOT} \
 		|| die "newconfd failed"
+
+	if use armitage; then
+#		dodoc *.txt
+		echo -e "#!/bin/sh \n\njava -Xmx256m -jar /usr/lib/${PN}${SLOT}/data/armitage/armitage.jar \$*\n" > armitage
+		dobin armitage
+	fi
 }
 
 pkg_postinst() {