diff --git a/dev-ruby/cms_scanner/cms_scanner-0.12.1.ebuild b/dev-ruby/cms_scanner/cms_scanner-0.12.1-r1.ebuild
similarity index 94%
rename from dev-ruby/cms_scanner/cms_scanner-0.12.1.ebuild
rename to dev-ruby/cms_scanner/cms_scanner-0.12.1-r1.ebuild
index 161783a32..17e7c8fbf 100644
--- a/dev-ruby/cms_scanner/cms_scanner-0.12.1.ebuild
+++ b/dev-ruby/cms_scanner/cms_scanner-0.12.1-r1.ebuild
@@ -25,6 +25,9 @@ ruby_add_rdepend "
 	dev-ruby/typhoeus:1
 	=dev-ruby/xmlrpc-0*
 	=dev-ruby/yajl-ruby-1.4*
+	dev-ruby/i18n
+	dev-ruby/minitest
+	dev-ruby/tzinfo
 "
 
 each_ruby_prepare() {
diff --git a/net-analyzer/metasploit/metasploit-6.0.6.ebuild b/net-analyzer/metasploit/metasploit-6.0.6.ebuild
index 161be6110..1c0e49497 100644
--- a/net-analyzer/metasploit/metasploit-6.0.6.ebuild
+++ b/net-analyzer/metasploit/metasploit-6.0.6.ebuild
@@ -18,8 +18,7 @@ else
 	##Tags https://github.com/rapid7/metasploit-framework/releases
 	MY_PV=${PV/_p/-}
 	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-#WIP
-#	KEYWORDS="~amd64"
+	KEYWORDS="~amd64"
 	RUBY_S="${PN}-framework-${MY_PV}"
 	SLOT="$(ver_cut 1).$(ver_cut 2)"
 fi
diff --git a/profiles/pentoo/base/package.accept_keywords/dev-ruby b/profiles/pentoo/base/package.accept_keywords/dev-ruby
index 60a65e2b0..d4ffabb8e 100644
--- a/profiles/pentoo/base/package.accept_keywords/dev-ruby
+++ b/profiles/pentoo/base/package.accept_keywords/dev-ruby
@@ -36,13 +36,13 @@ dev-ruby/faye-websocket
 dev-ruby/openssl-cmac
 =dev-ruby/ruby_smb-2*
 
-=dev-ruby/bson-4.10*
+=dev-ruby/bson-4.10* ~amd64
 =dev-ruby/ruby-net-ldap-0.16*
 =dev-ruby/bundler-audit-0.7.0*
 ~dev-ruby/network_interface-0.0.2
 ~dev-ruby/jsobfu-0.4.2
 =dev-ruby/octokit-4.18*
-=dev-ruby/nexpose-7.2*
+=dev-ruby/nexpose-7.2* ~amd64
 ~dev-ruby/bcrypt_pbkdf-1.0.0 **
 dev-ruby/faraday
 dev-ruby/rjb
@@ -121,7 +121,7 @@ dev-ruby/sprockets:2.2
 ~dev-ruby/database_cleaner-1.1.1
 ~dev-ruby/em-http-request-0.3.0
 ~dev-ruby/erubis-2.7.0
-~dev-ruby/factory_girl-4.5.0
+~dev-ruby/factory_girl-4.5.0 ~amd64
 ~dev-ruby/fivemat-1.3.2
 ~dev-ruby/hike-1.2.3
 ~dev-ruby/hoe-3.13.0
@@ -162,7 +162,7 @@ dev-ruby/pdf-reader:2
 dev-ruby/faker:0
 =dev-ruby/ruby-macho-2.2*
 =dev-ruby/ed25519-1.2*
-=dev-ruby/warden-1.2*
+=dev-ruby/warden-1.2* ~amd64
 
 
 #wpscan
diff --git a/profiles/pentoo/base/package.accept_keywords/net-analyzer b/profiles/pentoo/base/package.accept_keywords/net-analyzer
index dcc4e072e..e5ed75c48 100644
--- a/profiles/pentoo/base/package.accept_keywords/net-analyzer
+++ b/profiles/pentoo/base/package.accept_keywords/net-analyzer
@@ -76,7 +76,7 @@ net-analyzer/packit
 =net-analyzer/plecost-9999
 =net-analyzer/wafp-9999
 =net-analyzer/metasploit-9999 **
-=net-analyzer/metasploit-6*
+=net-analyzer/metasploit-6* ~amd64
 net-analyzer/multimon-ng
 ~net-analyzer/aimsniff-0.9d
 ~net-analyzer/arpantispoofer-1.0.1.32