diff --git a/dev-python/spake2/Manifest b/dev-python/spake2/Manifest
index b73e42f..0599720 100644
--- a/dev-python/spake2/Manifest
+++ b/dev-python/spake2/Manifest
@@ -1,4 +1,4 @@
-DIST spake2-0.8.tar.gz 62425 BLAKE2B 64215362af26fff0785fdabf4282f7111a4cc917750827075b616f009cb1fa6373fc2325382c26b43c051aa5b94e414ca2a5223d9ab666289eb2d04723b15cb5 SHA512 908c377c831f4a11551973ca917b113d51a66c533d35fd19b2692fdb7e575ed2a5045d9b632bc55c37b68ad092f01dff5da191e9dfbfb5599b72844788438d68
-EBUILD spake2-0.8.ebuild 774 BLAKE2B a18cdaf63edf9368d26c60e90b6472b80ee27559d77b037a22a82ca899a8f3ef3f7d0f4dc25121684cbf4fbca9ae237caf3444fb16263281a3f725d597f5f8df SHA512 f18de4f784ce8fc1dcb273f7a8c38fa42cc37b74ae1927b83f78af2feedb0fa9b4fcaa03a7e3b2b1444db1ed84fd6d3fb74ebf09a926740c8c6c4b627ac34b04
-EBUILD spake2-9999.ebuild 774 BLAKE2B a18cdaf63edf9368d26c60e90b6472b80ee27559d77b037a22a82ca899a8f3ef3f7d0f4dc25121684cbf4fbca9ae237caf3444fb16263281a3f725d597f5f8df SHA512 f18de4f784ce8fc1dcb273f7a8c38fa42cc37b74ae1927b83f78af2feedb0fa9b4fcaa03a7e3b2b1444db1ed84fd6d3fb74ebf09a926740c8c6c4b627ac34b04
+DIST spake2-0.8.gh.tar.gz 62425 BLAKE2B 64215362af26fff0785fdabf4282f7111a4cc917750827075b616f009cb1fa6373fc2325382c26b43c051aa5b94e414ca2a5223d9ab666289eb2d04723b15cb5 SHA512 908c377c831f4a11551973ca917b113d51a66c533d35fd19b2692fdb7e575ed2a5045d9b632bc55c37b68ad092f01dff5da191e9dfbfb5599b72844788438d68
+EBUILD spake2-0.8.ebuild 776 BLAKE2B be29df7c53ab219dcec0bf18a75b1594b93cce06363e5d5d2340e5cda05772fcef42114f40821987b84a2b782695c9deccb2448f591df474fb4f2b9f7160ad84 SHA512 e074a5cf4babb20a007bcbacdf67618ef2d3d0cbea26d7a5429842f7d55e35103b7b26d3bb08f1b42672115f2aab2fadbaea8cd4412d39ee4e81c2b420caad96
+EBUILD spake2-9999.ebuild 776 BLAKE2B be29df7c53ab219dcec0bf18a75b1594b93cce06363e5d5d2340e5cda05772fcef42114f40821987b84a2b782695c9deccb2448f591df474fb4f2b9f7160ad84 SHA512 e074a5cf4babb20a007bcbacdf67618ef2d3d0cbea26d7a5429842f7d55e35103b7b26d3bb08f1b42672115f2aab2fadbaea8cd4412d39ee4e81c2b420caad96
 MISC metadata.xml 371 BLAKE2B 217e796d2688accc20d1345bcb40a494baa8809e90f1992fc72c5ba01ad240e6c5e651b4f70b2d01569fb74553ce1ac7b596bee58833c0fba5724260418a7539 SHA512 279d4030696b1d4f39bc56921d2c77b5e1544ef96544fe7cdc5ae8817a474377aaf93b6e9a9a1e91bf1cea75df0d22fe4043bce680c8ab0225c824efa786f27a
diff --git a/dev-python/spake2/spake2-0.8.ebuild b/dev-python/spake2/spake2-0.8.ebuild
index 0c459dc..38dfdf8 100644
--- a/dev-python/spake2/spake2-0.8.ebuild
+++ b/dev-python/spake2/spake2-0.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ else
 	MY_PN="python-${PN}"
 	MY_P="${MY_PN}-${PV}"
 	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/warner/python-spake2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/warner/python-spake2/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
diff --git a/dev-python/spake2/spake2-9999.ebuild b/dev-python/spake2/spake2-9999.ebuild
index 0c459dc..38dfdf8 100644
--- a/dev-python/spake2/spake2-9999.ebuild
+++ b/dev-python/spake2/spake2-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ else
 	MY_PN="python-${PN}"
 	MY_P="${MY_PN}-${PV}"
 	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/warner/python-spake2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/warner/python-spake2/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 	KEYWORDS="~amd64"
 fi