diff --git a/dev-python/tchannel/Manifest b/dev-python/tchannel/Manifest
index 57cae519f4..cff63b8da0 100644
--- a/dev-python/tchannel/Manifest
+++ b/dev-python/tchannel/Manifest
@@ -1 +1 @@
-DIST tchannel-2.1.0.tar.gz 89466 BLAKE2B cbda9700d0bb547e972ebd295706a82b02e1a6472edeca9f9b494bb10b8604bfd5f8c173bcb51a75a848e36bb0984407aa6a4fd252e6905c47946bfd0e0f38d7 SHA512 cf9bd0f4d4390c58e80dc784ea304114bebfa6ee00f4dd34daaafe63ba00c9c9c4ac14bc2766df5e5087357aefadb1b716b3a8d9f6a940484fe7b650caaaabef
+DIST tchannel-2.1.0-gh.tar.gz 199413 BLAKE2B 20c25526440e9378acfba1dd9c05aaa5a5300bb19ec2c78c1997bfc7ce6be740bca7ef6d4fd49048c42e57f649f33b8c124955dc347bba81501fdf778ce4177e SHA512 651159cdbb83f59039d1c51ad5d5af7c0bf20e8a8fbb6c83c76bdc78cda809bea883d65947c5171c6dd2992ea499d543c4a2dad1102c6a7a4d631e24f005453c
diff --git a/dev-python/tchannel/metadata.xml b/dev-python/tchannel/metadata.xml
index 629511b0b5..57a5d0973d 100644
--- a/dev-python/tchannel/metadata.xml
+++ b/dev-python/tchannel/metadata.xml
@@ -8,6 +8,6 @@
   <upstream>
     <bugs-to>https://github.com/uber/tchannel/issues</bugs-to>
     <remote-id type="pypi">tchannel</remote-id>
-    <remote-id type="github">uber/tchannel</remote-id>
+    <remote-id type="github">uber/tchannel-python</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/tchannel/tchannel-2.1.0.ebuild b/dev-python/tchannel/tchannel-2.1.0.ebuild
index d427ecb9b2..64e477dcec 100644
--- a/dev-python/tchannel/tchannel-2.1.0.ebuild
+++ b/dev-python/tchannel/tchannel-2.1.0.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+MYPN="${PN}-python"
 PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
 DESCRIPTION="Network multiplexing and framing protocol for RPC"
-HOMEPAGE="https://github.com/uber/tchannel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="https://github.com/uber/tchannel-python"
+SRC_URI="https://github.com/uber/${MYPN}/archive/refs/tags/${PV}.tar.gz -> ${P}-gh.tar.gz"
+S="${WORKDIR}/${MYPN}-${PV}"
 
 SLOT="0"
 LICENSE="MIT"
@@ -23,8 +25,8 @@ RDEPEND="
 	>=dev-python/threadloop-1[${PYTHON_USEDEP}]
 	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	test? (
 		>=dev-python/hypothesis-1.14[${PYTHON_USEDEP}]
 		dev-python/ipdb[${PYTHON_USEDEP}]