diff --git a/dev-ruby/rjb/Manifest b/dev-ruby/rjb/Manifest
index dc0e3704e..ca3f96b8f 100644
--- a/dev-ruby/rjb/Manifest
+++ b/dev-ruby/rjb/Manifest
@@ -3,6 +3,6 @@ DIST rjb-1.4.1.gem 65024 SHA256 6d919aa420e6ea237f3145cbef3b554405d492d39600d7fc
 DIST rjb-1.4.5.gem 87040 SHA256 a94eef4a2d7d6e38abac29a750181d6d60229490aeeeabb808539be92e412624 SHA512 4ffc333bb364afa4528aadda4ce9674c79f03ff8613d545b896e6c2c128f38d33e33cf82271bea2c8a66a89ada1ee634f8c999f88abbcb29e09381f2232a6a00 WHIRLPOOL 3f4806395dfa0a2d4aebe91a5976f097622110a0836b2f3093f0c93cf99d7562962ec600b1044bb397b7f4df1473855e3b348d42e12ba4ccf2aa890bce9310c3
 EBUILD rjb-1.3.8.ebuild 1445 SHA256 99b54eb7a26eba04291be51f07827997198e5cdd1e21f0bf1eceb6d65ae2bec6 SHA512 7def959ff99a514aeb0f1947bba6baf9239372aede3455507b03ea4c194743ef8bcc82a946c39f9dec5865ea3d255d5d01a2156c691c06bd94c67209470dc967 WHIRLPOOL 48587338dc1e640d9124d1da4609818cc7f0b32ebc989e017ab8da1466aca1238eb4719ceb3dd4004fa7f6479bf0a95e85bfd1c6af4a9ae67fae95282a6de3a2
 EBUILD rjb-1.4.1.ebuild 1473 SHA256 5a07354ee1ccd548ebba25bd3b7ec1e02caba35460e61f34c6b80f39d77a0330 SHA512 a4c6f59238a040a5bf5a9f61807bc6c2bcda439af67459775c88eef79ebc17b0a31a3b69833c9770532aacbe606080355a635e3b8ef396651a86dac9fc1f078e WHIRLPOOL b836048fa15c75cb05b9d53d8892f42396326dc163f3583be08a2cf668cfc164ef8ba483c1eca663d458f7eb2c682614dfa3b20448a3aeacf01708060bec0e05
-EBUILD rjb-1.4.5.ebuild 1478 SHA256 05651e496486f46187f4b9cb47b5e5bc2e3538ea9a9034a3f6bf2e38431b81ac SHA512 298a206d54e0763d5ef6c5ab375d1b062b2d13566bd86d0111e111c2dc58cdac3e60f8d4d2990a185d9b166696442b50d53822ac9fd171fce9fd76b550a319c7 WHIRLPOOL ebb7d2e05d747a91604819ef40b939f41e76e8a16a2acc477ef6d90bf1c0f0aa93f8e446b50d60aadd848a54c96bf20666b1d4513e525939ed6d8a6ad129bdb9
+EBUILD rjb-1.4.5.ebuild 1473 SHA256 971c6f193227373d1b8c82e4db5f66087ab65b82af0256ee3f4bbbd2d261ddb2 SHA512 d1008e76cb1b0e1aadab67a07a41f5d1a82b0c2e6971760041a690d994a20f65c318187084d25278210abe26953025f3ed069fe7ff06db32458c8f3549b7c4bf WHIRLPOOL 8dd6782d6fca817e2b6509ce3926ff5b2370f66342a40a165b552bf042d576f3d1683637f1e8d988b8ba6e8dde12a2c66fd81499151767d97310eab9eaa379fb
 MISC Changelog 289 SHA256 1e05553cd13b2ad0e935a11df155e989fffa4fdedaaa78140eaaec3e451bc2df SHA512 2e604f6aa61db53baa783678ceb3a30b18ef8e7228e33d09bc1b045f9981ff557e7431eea22b1ba97e9050be13e1057f3e7c063c406a76c4fccacea95434876d WHIRLPOOL 2b785bbea32c14d8463056ae07f741e948ff018e9b2db77123615f55bddce2d7ed2376af09e1cf3fddb56515eed3dc45e4b68ab41e91d7430ec5960bce005d36
 MISC metadata.xml 221 SHA256 d114187ee5bb84d05e5d0654deb9148f2b4100c127266eca82b49ba011941616 SHA512 b607c38c92a21847175d4f90e6990d5ba2ac4d035cc0c2ece4f63547d778ca328e41b783a82db683d11abefbc1771ccb224a01cf717b5f872ce08e6072a4e341 WHIRLPOOL 78ff30cc7bfa452affef769ae63570c6181d29d0ade8be0d4b133957de1ee46fa0450c21f0e083fcddcae2cb29d5cb3c4e08ffb307de95c3898d59890f0d2acc
diff --git a/dev-ruby/rjb/rjb-1.4.5.ebuild b/dev-ruby/rjb/rjb-1.4.5.ebuild
index 6f905d0bc..6554b7364 100644
--- a/dev-ruby/rjb/rjb-1.4.5.ebuild
+++ b/dev-ruby/rjb/rjb-1.4.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://rjb.rubyforge.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="examples hardened"
 
 DEPEND=">=virtual/jdk-1.5
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 5faeb06b9..bd0941c05 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,5 +1,5 @@
 AUX database.yml 481 SHA256 2db3df7b05f28aa5ba6d6dedc32d8d1a2e24e020d6fd8aea15b2e76ed0f6ab46 SHA512 98a83f972f78ee63d241b58fbdce3171a24b2435371d46cad609f2f2ad50a5853cbfda5cf4632cfd9e69b2fb7ba3ce3c6aa765c7b44fbeb3eed868ffc068241d WHIRLPOOL ac85e47c26dcf56d69028af91513802767a2243ff52f6e031d447dfbda9120bd6436b4a0c6ab118cf3fd09dc3b47613e4e75c8ef83f4528783402bba1ab5e2ba
 AUX metasploit.icon 7630 SHA256 d197dd3b939c35d951c2cd5c19b51200ada7f8f92d90775a9eaebdccf18e3949 SHA512 569db261a3782f3874c30ccaf076be512437a9a5a9df835baf29bacec48dd76b2896e009b5ab165ba82aff72ab15d067155f257787e69c3a7cd034dafa5a9066 WHIRLPOOL 3f66eb2a3b51dc787f5da6b2fd93165fdca3e9ae391db0ea69cb0ea5c6c1d9f2d85fffbdb117da4065e0b3e29daa5b7d7e62740cd3210768aa0cfc4a63679376
 DIST framework-4.6.0.tar.bz2 49996884 SHA256 ec6dfe58cb5a897e8c8e56d919dec7c00d56fe758efd1350c2a7a3587ef538c2 SHA512 ff73ebd5e08f96d7ffb63ad59cd4fa608705a1a72f00b82ce074fc537e7037349fedf71f768a895ec4e36aabb4ae07fd6b6a0f12ff88807b8ca9202f0d770633 WHIRLPOOL 952407ce34e0d94f7a824c6a3b963c6321da9aee0626295389b1f4f7d4671b9577e5bfab8f581144696f6c4a1bb073f7b7056d8c54853dbf60a6dcb7c320b336
-EBUILD metasploit-4.6.0.ebuild 6614 SHA256 f3c5a7ccf99d121edc7afc3a7c055d98c0e0bd512a6e5093029a4c5ab5fb87b8 SHA512 94229abb9ac3f8b932ab3b1631cf1388ec07a4b65331c5e517639969902366358fe36d11b449a9050449fcf37a89671294fa870d86c002381ec05a7bdefd5dc9 WHIRLPOOL 4a3cb12959de756b62b5a44357e0e093a2d5b84f328c1fa0eba39fd2267b6910be851bc4e75336ab8fdf0791d6f067fe4ebf498f44af750a35fec751e70c8545
-EBUILD metasploit-9999.ebuild 6616 SHA256 3539b5a48d21784a4a2bde0b4bcbd188b3616c94bbe1bf40cf0f97ca6e51752a SHA512 46002a9bfb223aedb5f16e3b7c64038ff06489b3bb1d84bdb85a1011b84d0f44a8321806740c01fe049eec354c68a131dfb9c1641254e975b53c4a85b2b53987 WHIRLPOOL c3e43aa03767dc5827044359bcf8da9b0b37efaa142af893e49cb42d7f1fdc62098a3a9a35cfe7bfa0b944a1801834c8718499bae23b0cbe267437b78392cb03
+EBUILD metasploit-4.6.0.ebuild 6623 SHA256 f8d79cbe175ed87a0bd4e664dc826bcc7ddae225fc3d88d619cd23793775be70 SHA512 063e48d3f8624cdd996323a4fb64a3008383517f28e99a346e1b866531b22432f80ed00e5b5ef758c5e6323564f1638c126d4ee3639cd52914037053a1175b6e WHIRLPOOL 7f3232d1b19b75f5a68c843b4ea8b05b71c356b81b2a168120a559fda02e6e890a52ada35c9cc0635ca905a5566217a4dfbcd3f712bc4f34544b1d44c94986b5
+EBUILD metasploit-9999.ebuild 6625 SHA256 599563e98f89aa0997bad252d62817b38c4b08f44bec44981433d432eba5895d SHA512 cf2982528e7c39ddbdeda4f5c8b96b32c92cb34d34b8bc667839629c40fb2c38c68dbdb8262b5960af4d7fd30116ce402aa4fee3af5ffb4a3ab63781e2e1bc89 WHIRLPOOL 05556978073b3c2ed832ca8b392dbf531040850e5cda6020e15a7155b453f059eb907cf8f8f217b37caaa2b587615187eb5ea771ca7b00ff286d9e77e6dafb6b
diff --git a/net-analyzer/metasploit/metasploit-4.6.0.ebuild b/net-analyzer/metasploit/metasploit-4.6.0.ebuild
index 4bf2325d2..e23588426 100644
--- a/net-analyzer/metasploit/metasploit-4.6.0.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.6.0.ebuild
@@ -43,7 +43,7 @@ RDEPEND="${DEPEND}
 	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
 	net-analyzer/nmap
 	gui? ( virtual/jre )
-	java? ( dev-ruby/rjb )
+	arm? ( java? ( dev-ruby/rjb ) )
 	pcaprub? ( net-libs/libpcap )
 	test? ( dev-ruby/bundler )"
 
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 09de6e17a..519ffb664 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -43,7 +43,7 @@ RDEPEND="${DEPEND}
 	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
 	net-analyzer/nmap
 	gui? ( virtual/jre )
-	java? ( dev-ruby/rjb )
+	arm? ( java? ( dev-ruby/rjb ) )
 	pcaprub? ( net-libs/libpcap )
 	test? ( dev-ruby/bundler )"