diff --git a/dev-ruby/cms_scanner/Manifest b/dev-ruby/cms_scanner/Manifest
index 082c89f49..f36f348d7 100644
--- a/dev-ruby/cms_scanner/Manifest
+++ b/dev-ruby/cms_scanner/Manifest
@@ -1 +1,2 @@
 DIST cms_scanner-0.13.6.gem 36352 BLAKE2B 9ba3e17d9be3b5451319e72a3c795ee86c885e6e8b0ae5e30963bf2985e121d541c052052d32ea93742c1d61d3ab3d15b8c6d43f3caaf370ee78dd8f57e1bed9 SHA512 06d7727408e034a10221d8eb5dec4c793ad890c40dec29eb1c9e384cdb47087b0740146d5a0e0117189a3f9b74dabc3239bfcbfb3a1fb6fb4d72b8ac2f4191a2
+DIST cms_scanner-0.13.7.gem 36352 BLAKE2B 0b6d95d565b18c66cdf4f6c3bfa25e58c033fc6fef725cd9f945413596484fbfd244ed22c5fd19aa7d32ecf6a0430d95b344054f3980d8c4c21db5a53b82ec05 SHA512 2b9b3892bcc93ae4f1bace01a816e4cd32f09c0b3a691415ee490eec6e2c23534086f4a17d5374a32a13555068705980e0a8e9f435ec1fea7d6368d4f6823d33
diff --git a/dev-ruby/cms_scanner/cms_scanner-0.13.7.ebuild b/dev-ruby/cms_scanner/cms_scanner-0.13.7.ebuild
new file mode 100644
index 000000000..b9531b460
--- /dev/null
+++ b/dev-ruby/cms_scanner/cms_scanner-0.13.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework to provide an easy way to implement CMS Scanners"
+HOMEPAGE="https://github.com/wpscanteam/CMSScanner"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0"
+
+ruby_add_rdepend "
+	=dev-ruby/get_process_mem-0.2*
+	>=dev-ruby/nokogiri-1.11.2 <dev-ruby/nokogiri-1.14.0
+	>=dev-ruby/opt_parse_validator-1.9.5
+	>=dev-ruby/public_suffix-4.0.3:4
+	=dev-ruby/ruby-progressbar-1.10*
+	dev-ruby/typhoeus:1
+	=dev-ruby/ethon-0.14*
+	=dev-ruby/xmlrpc-0*
+	=dev-ruby/yajl-ruby-1.4*
+
+	=dev-ruby/sys-proctable-1.2*
+"
+
+each_ruby_prepare() {
+	#relax deps
+	sed -i -e '/typhoeus/,/Gem::Dependency/ s:~>:>=:' ../metadata || die
+}
diff --git a/dev-ruby/opt_parse_validator/opt_parse_validator-1.9.5.ebuild b/dev-ruby/opt_parse_validator/opt_parse_validator-1.9.5.ebuild
index 5f0d51000..de4b15163 100644
--- a/dev-ruby/opt_parse_validator/opt_parse_validator-1.9.5.ebuild
+++ b/dev-ruby/opt_parse_validator/opt_parse_validator-1.9.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 USE_RUBY="ruby26 ruby27"
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://rubygems.org/gems/opt_parse_validator"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 #No Rakefile found (looking for: rakefile, Rakefile, rakefile.rb, Rakefile.rb)
diff --git a/net-analyzer/wpscan/Manifest b/net-analyzer/wpscan/Manifest
index 79b962d1f..fda902223 100644
--- a/net-analyzer/wpscan/Manifest
+++ b/net-analyzer/wpscan/Manifest
@@ -1 +1,2 @@
 DIST wpscan-3.8.19.tar.gz 11948193 BLAKE2B b0c8c8cc4881ac6642bcb0b51df42ea359eaedbc4400acc2873e4b37d0508138016195dfd90b2e92ed3f638c2b91d5f01b43d3c06432bb0b297aaf5001088d5b SHA512 68be98a57f96bdfc2df894a550d6c76f1f1b1cb61aaa31ad1770aba42eef7ea985227aacd303af571d6f0a50fba80989badb6d28671ba57a7c4457922b66c7d4
+DIST wpscan-3.8.21.tar.gz 12281007 BLAKE2B bff52e40f369eee73339124ae4df0ff37bf0600a323d25a55c169f88988b1ef91f05296897135e37fbebf5d0e3d9704cf296b9c8414b209f2a436f05904cfe5c SHA512 16d474f1430998642ad77d00ba13d10ac5276198812133f6366839f1d4c431cea1a38da9153fcc0337c792d0034607feaa17a1e8a651c824a65a0955894eb033
diff --git a/net-analyzer/wpscan/wpscan-3.8.21.ebuild b/net-analyzer/wpscan/wpscan-3.8.21.ebuild
new file mode 100644
index 000000000..aaf25859c
--- /dev/null
+++ b/net-analyzer/wpscan/wpscan-3.8.21.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
+RUBY_FAKEGEM_EXTRAINSTALL="app bin spec"
+RUBY_FAKEGEM_GEMSPEC="wpscan.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Wordpress security scanner"
+HOMEPAGE="http://wpscan.org/"
+SRC_URI="https://github.com/wpscanteam/wpscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+
+ruby_add_bdepend "dev-ruby/bundler:2"
+ruby_add_rdepend "
+	>=dev-ruby/cms_scanner-0.13.7"
+
+each_ruby_prepare() {
+#https://github.com/wpscanteam/wpscan/issues/1266
+#	sed -i "s|'activesupport', '~> 5.1'|'activesupport'|g" wpscan.gemspec
+#	sed -i -e '/activesupport/,/^-/ s:^:#:' ../metadata || die
+	sed -i -e '/s.add_development_dependency/d' wpscan.gemspec || die
+	GEM_HOME="${T}" BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+	GEM_HOME="${T}" BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+}