diff --git a/dev-python/twentyc-rpc/Manifest b/dev-python/twentyc-rpc/Manifest
index 406b1f2..ce1411c 100644
--- a/dev-python/twentyc-rpc/Manifest
+++ b/dev-python/twentyc-rpc/Manifest
@@ -1,2 +1 @@
-DIST twentyc-rpc-0.4.0.tar.gz 3338 BLAKE2B 3b3419595eebde2d34780fa112537fd0f014fda08833d60c1ac3ce6f202f041e7556995e2baae9d8e1b3f0cce78221ec116cb6f35905c06605d152b8564309c7 SHA512 b633ccc6c24610dbebe212e40292735113a56aa650c20b6eca6f67971368bb585745cc8d3b4dce91fce64ccd911db3322745051dc96caa27767afd306c6ba15b
 DIST twentyc-rpc-1.0.0.tar.gz 7414 BLAKE2B 9587fa596543ae0e96dca023c3d94d777687c1ad4bde0a9c860cf74e17741f21a4ce8d24357096cfe3c12e6c2bb97c715e3eee83374fdff4b88b55866fcaf1c7 SHA512 01e80e49fcc4982a0915cb80f5c4949720b6e80cfe840e38dbbbcb5f918f0b068b245fa37b4fe9436e2ec37dc77ae93d8f444085a855bf41a65dc2806464f066
diff --git a/dev-python/twentyc-rpc/twentyc-rpc-0.4.0.ebuild b/dev-python/twentyc-rpc/twentyc-rpc-0.4.0.ebuild
deleted file mode 100644
index 08b96d9..0000000
--- a/dev-python/twentyc-rpc/twentyc-rpc-0.4.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit distutils-r1
-
-MY_PN=${PN//-/.}
-
-DESCRIPTION="client for 20c's RESTful API"
-HOMEPAGE="https://pypi.org/project/twentyc.rpc/
-https://github.com/20c/twentyc.rpc"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-	<dev-python/six-2.0[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/twentyc-rpc/twentyc-rpc-1.0.0.ebuild b/dev-python/twentyc-rpc/twentyc-rpc-1.0.0.ebuild
index 83c81ee..28b5552 100644
--- a/dev-python/twentyc-rpc/twentyc-rpc-1.0.0.ebuild
+++ b/dev-python/twentyc-rpc/twentyc-rpc-1.0.0.ebuild
@@ -3,15 +3,16 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1 pypi
 
 MY_PN=${PN//-/.}
 
 DESCRIPTION="client for 20c's RESTful API"
 HOMEPAGE="https://pypi.org/project/twentyc.rpc/
 https://github.com/20c/twentyc.rpc"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="$(pypi_sdist_url --no-normalize)"
+S=${WORKDIR}/${P^}
 
 LICENSE="Apache-2.0"
 SLOT="0"