diff --git a/dev-ruby/cookiejar/cookiejar-0.3.3.ebuild b/dev-ruby/cookiejar/cookiejar-0.3.3.ebuild
index fd1f0ce5a..7efb2baf0 100644
--- a/dev-ruby/cookiejar/cookiejar-0.3.3.ebuild
+++ b/dev-ruby/cookiejar/cookiejar-0.3.3.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26"
 
 inherit ruby-fakegem
 
 DESCRIPTION="Allows for parsing and returning cookies in Ruby HTTP client code"
 HOMEPAGE="https://rubygems.org/gems/cookiejar"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 LICENSE=""
 SLOT="0"
diff --git a/dev-ruby/em-http-request/em-http-request-1.1.7.ebuild b/dev-ruby/em-http-request/em-http-request-1.1.7.ebuild
index 573842c79..d11e54cdf 100644
--- a/dev-ruby/em-http-request/em-http-request-1.1.7.ebuild
+++ b/dev-ruby/em-http-request/em-http-request-1.1.7.ebuild
@@ -10,7 +10,7 @@ inherit ruby-fakegem
 DESCRIPTION=""
 HOMEPAGE=""
 
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 LICENSE=""
 SLOT="0"
 
diff --git a/dev-ruby/em-socksify/em-socksify-0.3.2.ebuild b/dev-ruby/em-socksify/em-socksify-0.3.2.ebuild
index 001097df0..59e2b7fa1 100644
--- a/dev-ruby/em-socksify/em-socksify-0.3.2.ebuild
+++ b/dev-ruby/em-socksify/em-socksify-0.3.2.ebuild
@@ -11,7 +11,7 @@ inherit ruby-fakegem
 DESCRIPTION="Transparent proxy support for any EventMachine protocol"
 HOMEPAGE="https://github.com/igrigorik/em-socksify"
 
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 LICENSE=""
 SLOT="0"
 
diff --git a/dev-ruby/ipaddr/ipaddr-1.2.2-r1.ebuild b/dev-ruby/ipaddr/ipaddr-1.2.2-r1.ebuild
index 0b8fd9515..7d8cacedc 100644
--- a/dev-ruby/ipaddr/ipaddr-1.2.2-r1.ebuild
+++ b/dev-ruby/ipaddr/ipaddr-1.2.2-r1.ebuild
@@ -13,4 +13,4 @@ HOMEPAGE="https://github.com/ruby/ipaddr"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
diff --git a/net-analyzer/whatweb/Manifest b/net-analyzer/whatweb/Manifest
index 3eb13aa3e..5eea2b5d7 100644
--- a/net-analyzer/whatweb/Manifest
+++ b/net-analyzer/whatweb/Manifest
@@ -1,2 +1,2 @@
-DIST whatweb-0.5.1.tar.gz 3633302 BLAKE2B f5bcef621e48ea224acc71cac2068be07e243754bca30cd4b7991378d9321f7be3eb1b38922fd225c8254decca8abf9ba37e3f93f01a3cea5783fc227429758a SHA512 34ffa129b940362d646555f5f709da5ce6f5da3857242f1805ee9aac5661c63d4c5ec632f2f34cc09e0463ce1f754e65d898e471139191cbc0aeea004da697a2
 DIST whatweb-0.5.2.tar.gz 3633707 BLAKE2B 494931adbf2204d44f5581e55bee02659862821602e21781c1f985af18a105852451877a9b06f581b9bd0f96250bc382b48a986ac7a9453c8a00bbf8c896f292 SHA512 e461d583aa6841d737dd304331b482ed989d4717b7905b375def976206d47d1f06ee499d7a23af4b138c61482889df36facd346fba4e17d72a498d0d26bbfee6
+DIST whatweb-0.5.3.tar.gz 3637660 BLAKE2B 90d0f76d58b8030b428f06ec8b97f021e712c5593925fee3afcfe03b81cac22de1db3157ac5e6a27038af0a2ba636ab3a508e0491e4fb22fa920cd91eacea4a4 SHA512 5ebc9eaf518ea968b9ffb76938db8289860dc0ea5ad7a658a77b2a7254cc32bef6af1307e951478d10c228842673908f4769603fd1ce4c364c9674fc89e51a1f
diff --git a/net-analyzer/whatweb/whatweb-0.5.3.ebuild b/net-analyzer/whatweb/whatweb-0.5.3.ebuild
new file mode 100644
index 000000000..337e321fb
--- /dev/null
+++ b/net-analyzer/whatweb/whatweb-0.5.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+inherit ruby-single
+
+DESCRIPTION="Next generation web scanner, identifies what software websites are running"
+HOMEPAGE="http://www.morningstarsecurity.com/research/whatweb"
+SRC_URI="https://github.com/urbanadventurer/WhatWeb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="json"
+
+DEPEND="dev-ruby/bundler:2"
+RDEPEND="${DEPEND}
+	${RUBY_DEPS}
+	dev-ruby/addressable
+	dev-ruby/ipaddr
+	json? ( dev-ruby/json )"
+
+#future rdepend:
+#dns: em-resolv-replace
+#mongodb: bison bson_ext mongo rchardet
+
+S="${WORKDIR}/WhatWeb-${PV}"
+
+src_prepare() {
+	# fix installation
+	sed -i '/gzip/d' Makefile || die
+#	sed -i 's|plugins-disabled||g' Makefile || die
+	sed -i 's|$(DOCPATH)/$(NAME)|$(DOCPATH)/${PF}|g' Makefile || die
+	sed -i '/bundle install/d' Makefile || die
+	sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
+	sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+
+#	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+#	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+	BUNDLE_GEMFILE=Gemfile ruby -S bundle install --local || die
+	BUNDLE_GEMFILE=Gemfile ruby -S bundle check || die
+
+	eapply_user
+}
+
+src_compile() {
+	einfo "Nothing to compile"
+}
+
+src_install() {
+	dodir /usr/share/doc/"${PF}"
+	dodir /usr/bin
+	DESTDIR="${D}" emake install
+
+	dodoc CHANGELOG.md README.md whatweb.xsl
+}
diff --git a/profiles/pentoo/base/package.accept_keywords/dev-ruby b/profiles/pentoo/base/package.accept_keywords/dev-ruby
index 077bab71a..0ba5a0e36 100644
--- a/profiles/pentoo/base/package.accept_keywords/dev-ruby
+++ b/profiles/pentoo/base/package.accept_keywords/dev-ruby
@@ -26,9 +26,6 @@ dev-ruby/coffee-rails:5.0
 dev-ruby/mini_exiftool
 
 # Pentoo ebuilds:
-dev-ruby/cookiejar
-dev-ruby/em-http-request
-dev-ruby/em-socksify
 dev-ruby/hrr_rb_ssh
 dev-ruby/irb
 dev-ruby/faye-websocket
@@ -284,6 +281,3 @@ dev-ruby/sass-rails:5.0
 ~dev-ruby/journey-1.0.4
 ~dev-ruby/rack-test-0.6.2
 dev-ruby/mysql2:0.5
-
-#whatweb
-dev-ruby/ipaddr