diff --git a/dev-python/pyjwt/#pyjwt-2.1.0.ebuild# b/dev-python/pyjwt/#pyjwt-2.1.0.ebuild#
new file mode 100644
index 000000000..9e6558bfb
--- /dev/null
+++ b/dev-python/pyjwt/#pyjwt-2.1.0.ebuild#
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 eutils
+
+MY_PN="PyJWT"
+
+DESCRIPTION="JSON Web Token implementation in Python"
+HOMEPAGE="https://github.com/progrium/pyjwt https://pypi.org/project/PyJWT/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 x86 amd64-linux x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/cryptography-1.4.0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+python_prepare_all() {
+	find . -name '__pycache__' -prune -exec rm -rf {} \; || die "Cleaning __pycache__ failed"
+	find . -name '*.pyc' -exec rm -f {} \; || die "Cleaing *.pyc failed"
+
+	# enables coverage, we don't need that
+	rm setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	elog "Available optional features:"
+	optfeature "cryptography" dev-python/cryptography
+	optfeature "flake8" dev-python/flake8
+
+	ewarn "flake8 feature requires 'flake8-import-order' and 'pep8-naming', which are not in portage yet"
+}
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index e458367fd..dd52831b7 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -1,3 +1,5 @@
 DIST PyJWT-1.7.1.tar.gz 41979 BLAKE2B 5604b309838b2dfb2f95e18e291c43703954664aa8acb7439072f002c1c8a1e49ff2c21d907be77a4d2f86e695ec71970d550aad2541252ac85bd7133e300b28 SHA512 70cd38127b6848933992c8b88303725ef71bfb430ad42eb63247e549b0bdab2a194137349d43ab02a1c97212dbc89f447ee3f0c5403dd14632b8b4b6b9235fc4
+DIST PyJWT-2.1.0.tar.gz 60092 BLAKE2B 59bde5f73558c74c964136ce0e8e9b5db6b76d226805fdb8aa8f201f00dceed0036693aa9295fa0ebac03c8fdac29a28f2aa79c697155c0ca744d1549e9bb47a SHA512 d701919c6cf06acb45cb0762a4ab7cc5e6ea247fbc0de80d0efdd1fc4b966c0d27c7400869858bbdc457b200586635aeefa8a38b85db818df6a8713f9bda8ab8
 EBUILD pyjwt-1.7.1-r1.ebuild 1280 BLAKE2B 40a0311e4a04c7501da1016c117d05c712cc2f99250ef5f6896c02b10560ca527215f4c30986d4632872262d102bd085659d8973ce2a9c1dc2c48ed18b9e6714 SHA512 6ee20f88461880be62ac68e4ef6946ba373b89924b2f462137c8e0f89a77c5a5ed756bb0ab37fb02e857815b91c800effa1526d719b752cebe3a85fadb6ea9c8
-MISC metadata.xml 252 BLAKE2B 507e0ddc9d50b879ff374b903b142f85d020dfd6c486aba2af84fe082c878e780edbb79188ae10104d57db0eb775c86814cc8c06891a3854c9da840a4d377050 SHA512 9470ac9c8a5a4f80e3f767e7aa198addc7b21866c63b2a310e9f41ce65817672fb77423117bdd619e99cb62322025aeadf50717e23eafabf99080fcc106820af
+EBUILD pyjwt-2.1.0.ebuild 740 BLAKE2B 0c7fe5da929b1b6bfc1b3e87b918ca8ea7e89c26c6a21527c411cd036f0bbabdfd90d0f23e94092b5cfe4453215e08634083cbc61e517570fc78b42f76e614b4 SHA512 52f4a644f4e87fcb29faa993d7d035ebe52fa9b19f5410c3e58dfeee2cb9b02b1276ae80746389688a4d6ddf94f9fcc84eb862d0bde855c1db13d9bf93910bab
+MISC metadata.xml 448 BLAKE2B e4ceaee9c8f4d05e5a265a49b1007563e934f5dbffc8ffb8f0ed24873c6c455232ffc8f2cb7ea48baa1adb4c8e9f3670003b3b57ccdbec5b8d39417d7f654749 SHA512 287e4297484ca05a9156d6fdb6d47a84ddbc91dd6ac3f732f791c398dbfc5f507d5c54faa54e164fa4d6f634dc631c78e6c04b78e8de8da90caca35d96dce91a
diff --git a/dev-python/pyjwt/metadata.xml b/dev-python/pyjwt/metadata.xml
index 70d025d32..874107e7d 100644
--- a/dev-python/pyjwt/metadata.xml
+++ b/dev-python/pyjwt/metadata.xml
@@ -5,4 +5,11 @@
     <email>b@edevau.net</email>
     <name>Andreas Billmeier</name>
   </maintainer>
+  <upstream>
+    <remote-id type="pypi">PyJWT</remote-id>
+    <maintainer status="unknown">
+      <email>hello@jpadilla.com</email>
+      <name>Jose Padilla</name>
+    </maintainer>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/pyjwt/pyjwt-2.1.0.ebuild b/dev-python/pyjwt/pyjwt-2.1.0.ebuild
new file mode 100644
index 000000000..ca958bd90
--- /dev/null
+++ b/dev-python/pyjwt/pyjwt-2.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 optfeature
+
+MY_PN="PyJWT"
+DESCRIPTION="JSON Web Token implementation in Python"
+HOMEPAGE="https://github.com/jpadilla/pyjwt/ https://pypi.org/project/PyJWT/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="!dev-python/python-jwt"
+BDEPEND="
+	test? (
+		>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "cryptography" dev-python/cryptography
+}