diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 2859e1415..64396c6e2 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -5,4 +5,4 @@ AUX smart_hasdump_script_6ac6c1d.rb 15510 RMD160 3ff084bf3b86df1fa37499b004ca040
 DIST dns_fuzzer.rb 19884 RMD160 1a403637009cba5eec88647a6e54c0e6ef771e8d SHA1 7076259a5c93caa6471845db2cf4ea5e3a6647a7 SHA256 02818f5cd0554a5408a5ba28a931e79527d584645b1c87cf2b2291c14532a587
 DIST jboss_seam_remote_command_rb 3412 RMD160 c577b1bd75943f2ddceea3161bc1037dd0150c2f SHA1 b858c726d3ee26317726635373d5db3b7eeb774d SHA256 c87f1cc1b82ed105c7bf551db7e3bad0a787244c4cdd124015a3ff24cedd23df
 DIST vbsmem-1.2.1.patch 69002 RMD160 281461151b0d1e453ee613326f4457eebaddebaa SHA1 883a582552e00102be452a2a0105b9e016b3dccc SHA256 7991a5629c562817919c9bb1c8f0a3bdcd1c63cf9b9f32f322d1d266416589d2
-EBUILD metasploit-9999.ebuild 7202 RMD160 ef597ba0da59731a0d6a687ecb3d716dfb21cb3f SHA1 2581b0239c7c3b17a30bf40a93315d18eb30c7f3 SHA256 6d6af0c9753eade08276f93078d57ae03ad79d8b1278c2e2619108fd0bc82854
+EBUILD metasploit-9999.ebuild 6919 RMD160 627c32c8eac8854b447695324a7d7a59a5205c6f SHA1 96c148818859e7c397cd7949931f89c74195aecd SHA256 592bd8edc2eb3c20e6a2f0f5c41deaa1d6a53fcea04ef69488c8a89d7990844c
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index bcaa13b28..d9adbd99b 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -30,37 +30,30 @@ HOMEPAGE="http://www.metasploit.org/"
 
 LICENSE="BSD"
 SLOT="9999"
-KEYWORDS="amd64 arm ppc ~sparc x86"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
 IUSE="armitage symlink unstable mysql pcaprub postgres"
 
 REQUIRED_USE="armitage? ( || ( mysql postgres ) )"
 
 # blocker on ruby-1.8.7:
 # http://spool.metasploit.com/pipermail/framework/2008-September/003671.html
+DEPEND=""
 RDEPEND="dev-lang/ruby
 	dev-ruby/rubygems
-	!arm? ( virtual/jdk
-		dev-ruby/rjb )
-	dev-ruby/hpricot
-	mysql? ( dev-ruby/mysql-ruby
-		dev-ruby/activerecord )
+	!arm? ( dev-ruby/hpricot
+		!sparc? ( virtual/jdk
+			  !ppc? ( dev-ruby/rjb ) ) )
+	mysql? ( !arm? ( dev-ruby/mysql-ruby
+			dev-ruby/activerecord ) )
+	postgres? ( dev-db/postgresql-server
+		    !arm? ( dev-ruby/pg
+			    dev-ruby/activerecord ) )
 	pcaprub? ( net-libs/libpcap )
-	postgres? ( dev-ruby/pg
-		dev-db/postgresql-server
-		dev-ruby/activerecord )
 	armitage? ( net-analyzer/nmap
 		!net-analyzer/armitage )
 	symlink? ( !=net-analyzer/metasploit-2.7 )"
-DEPEND=""
 
-QA_PRESTRIPPED="
-	usr/lib/${PN}${SLOT}/data/msflinker_linux_x86.bin
-	usr/lib/${PN}${SLOT}/data/templates/template_armle_linux.bin
-	usr/lib/${PN}${SLOT}/data/templates/template_x86_linux.bin
-	usr/lib/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/lib/${PN}${SLOT}/data/john/run.linux.x86.any/*
-	usr/lib/${PN}${SLOT}/data/john/run.linux.x86.mmx/*
-	"
+RESTRICT="strip"
 
 QA_EXECSTACK="
 	usr/lib/${PN}${SLOT}/data/msflinker_linux_x86.bin"