diff --git a/dev-python/impacket/impacket-0.9.21.ebuild b/dev-python/impacket/impacket-0.9.21-r1.ebuild
similarity index 100%
rename from dev-python/impacket/impacket-0.9.21.ebuild
rename to dev-python/impacket/impacket-0.9.21-r1.ebuild
diff --git a/dev-python/impacket/impacket-9999.ebuild b/dev-python/impacket/impacket-9999.ebuild
index 0474c7c75..3d7d7a1db 100644
--- a/dev-python/impacket/impacket-9999.ebuild
+++ b/dev-python/impacket/impacket-9999.ebuild
@@ -25,9 +25,9 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 RDEPEND="${PYTHON_DEPS}
-	=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}]
 	dev-python/pycryptodomex[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	>=dev-python/ldap3-2.5.1[${PYTHON_USEDEP}]
 	>=dev-python/ldapdomaindump-0.9.0[${PYTHON_USEDEP}]
diff --git a/pentoo/pentoo-scanner/pentoo-scanner-2019.2.ebuild b/pentoo/pentoo-scanner/pentoo-scanner-2020.0.ebuild
similarity index 92%
rename from pentoo/pentoo-scanner/pentoo-scanner-2019.2.ebuild
rename to pentoo/pentoo-scanner/pentoo-scanner-2020.0.ebuild
index 63b2ac4d0..e7521b40f 100644
--- a/pentoo/pentoo-scanner/pentoo-scanner-2019.2.ebuild
+++ b/pentoo/pentoo-scanner/pentoo-scanner-2020.0.ebuild
@@ -14,7 +14,6 @@ IUSE="pentoo-full"
 PDEPEND="net-analyzer/nmap
 	net-analyzer/mdns-scan
 	pentoo-full? (
-		amd64? ( net-analyzer/zmap )
 		net-analyzer/enum4linux
 		net-analyzer/firewalk
 		net-analyzer/hunt
@@ -28,5 +27,6 @@ PDEPEND="net-analyzer/nmap
 		net-analyzer/scanssh
 		net-analyzer/upnpscan
 		net-analyzer/wapiti
-		net-analyzer/wpscan
+		amd64? ( net-analyzer/wpscan
+			net-analyzer/zmap )
 	)"
diff --git a/profiles/pentoo/base/package.accept_keywords/app-crypt b/profiles/pentoo/base/package.accept_keywords/app-crypt
index 70f1d224f..5cff7e453 100644
--- a/profiles/pentoo/base/package.accept_keywords/app-crypt
+++ b/profiles/pentoo/base/package.accept_keywords/app-crypt
@@ -15,7 +15,7 @@ app-crypt/asleap
 
 #Gentoo
 
-=app-crypt/yubikey-manager-qt-1.1*
+=app-crypt/yubikey-manager-qt-1.1* **
 ~app-crypt/yubikey-manager-3.1.1
 
 ~dev-python/pyotherside-1.5.4