diff --git a/dev-python/impacket/Manifest b/dev-python/impacket/Manifest
index 5c1af38b3..a7541c959 100644
--- a/dev-python/impacket/Manifest
+++ b/dev-python/impacket/Manifest
@@ -1,2 +1 @@
-DIST impacket-0.9.20.tar.gz 1242341 BLAKE2B 91093dd46565d4c9b1d5a117ec875987a91a04fe72ef6827f4916844fb95c0255c7c8b9f19ffd2df26761be3a80e5daad0b2332ffa54bfbedcc9ea738a2bc567 SHA512 14e97d03352b8a86701f0f6cdd688b8a7b9952eef5bf3ed9b984fbec6ee60b427c7d8f4200ddc0ae44279c78db30b6a2a48330243da80de25f7d9541a202e731
 DIST impacket-0.9.21.tar.gz 1269120 BLAKE2B 2f1bd11fb12b995d5c64f55151859296c55e5c2b27bfbcdea852972da3581959d5b4ef108891ac408f669f03d5f1a2d34f801fce2244d8dc2fedae89ce84dfe3 SHA512 9602019461cc07c2fc1e1a7baf40da0558a6cea4f6086e3c4ee16562cf0298c099c88f32ff7842ba403fc1560ccf29c1b3e9671cddcacb3ff6473d95dc11df2a
diff --git a/dev-python/impacket/files/840.patch b/dev-python/impacket/files/840.patch
new file mode 100644
index 000000000..ae630ca58
--- /dev/null
+++ b/dev-python/impacket/files/840.patch
@@ -0,0 +1,25 @@
+From a1d2b978a7dc986d4a6c17a17f9ec170b2e298af Mon Sep 17 00:00:00 2001
+From: ThePirateWhoSmellsOfSunflowers
+ <ThePirateWhoSmellsOfSunflowers@users.noreply.github.com>
+Date: Mon, 27 Apr 2020 21:36:33 +0200
+Subject: [PATCH] fix the comparison for paged results
+
+---
+ impacket/ldap/ldap.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/impacket/ldap/ldap.py b/impacket/ldap/ldap.py
+index f33a0296..21ba7753 100644
+--- a/impacket/ldap/ldap.py
++++ b/impacket/ldap/ldap.py
+@@ -397,8 +397,8 @@ def _handleControls(self, requestControls, responseControls):
+             for requestControl in requestControls:
+                 if responseControls is not None:
+                     for responseControl in responseControls:
+-                        if requestControl['controlType'] == CONTROL_PAGEDRESULTS:
+-                            if responseControl['controlType'] == CONTROL_PAGEDRESULTS:
++                        if str(requestControl['controlType']) == CONTROL_PAGEDRESULTS:
++                            if str(responseControl['controlType']) == CONTROL_PAGEDRESULTS:
+                                 if hasattr(responseControl, 'getCookie') is not True:
+                                     responseControl = decoder.decode(encoder.encode(responseControl),
+                                                                  asn1Spec=KNOWN_CONTROLS[CONTROL_PAGEDRESULTS]())[0]
diff --git a/dev-python/impacket/impacket-0.9.20.ebuild b/dev-python/impacket/impacket-0.9.21-r2.ebuild
similarity index 71%
rename from dev-python/impacket/impacket-0.9.20.ebuild
rename to dev-python/impacket/impacket-0.9.21-r2.ebuild
index 793982e46..f5b93cd66 100644
--- a/dev-python/impacket/impacket-0.9.20.ebuild
+++ b/dev-python/impacket/impacket-0.9.21-r2.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-# TODO: add py3.* support
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -25,17 +24,18 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/ldap3-2.5.1[${PYTHON_USEDEP}]
-	dev-python/ldapdomaindump[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}]
+	dev-python/pycryptodomex[${PYTHON_USEDEP}]
+	>dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pycryptodomex[${PYTHON_USEDEP}]"
-
+	>=dev-python/ldap3-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/ldapdomaindump-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-1.0[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
+#fastforward patch https://github.com/SecureAuthCorp/impacket/pull/840
+PATCHES=( "${FILESDIR}/840.patch" )
+
 python_prepare_all() {
 	# do not install data files under Gentoo
 	sed -i -e "s|Darwin|Linux|" setup.py || die