diff --git a/dev-python/clint/clint-0.5.1-r3.ebuild b/dev-python/clint/clint-0.5.1-r3.ebuild
index f985c3f2fb2f1..530a51074740b 100644
--- a/dev-python/clint/clint-0.5.1-r3.ebuild
+++ b/dev-python/clint/clint-0.5.1-r3.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Python Command-line Application Tools"
-HOMEPAGE="https://github.com/kennethreitz/clint"
-SRC_URI="https://github.com/kennethreitz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/kennethreitz-archive/clint"
+SRC_URI="https://github.com/kennethreitz-archive/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
diff --git a/dev-python/clint/metadata.xml b/dev-python/clint/metadata.xml
index 7ae38406c025f..efb3f4fc03ee7 100644
--- a/dev-python/clint/metadata.xml
+++ b/dev-python/clint/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<!--maintainer-needed-->
 	<upstream>
-		<remote-id type="github">kennethreitz/clint</remote-id>
+		<remote-id type="github">kennethreitz-archive/clint</remote-id>
+		<remote-id type="pypi">clint</remote-id>
 	</upstream>
 </pkgmetadata>