diff --git a/dev-python/python-ctags/metadata.xml b/dev-python/python-ctags/metadata.xml
index 123026b36366f..17a2cc790006a 100644
--- a/dev-python/python-ctags/metadata.xml
+++ b/dev-python/python-ctags/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">python-ctags3</remote-id>
-		<remote-id type="github">jonashaag/python-ctags3</remote-id>
-		<bugs-to>https://github.com/jonashaag/python-ctags3/issues</bugs-to>
+		<remote-id type="github">universal-ctags/python-ctags3</remote-id>
+		<bugs-to>https://github.com/universal-ctags/python-ctags3/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-ctags/python-ctags-1.5.0.ebuild b/dev-python/python-ctags/python-ctags-1.5.0.ebuild
index 64adaec8d2aad..11636912c57fd 100644
--- a/dev-python/python-ctags/python-ctags-1.5.0.ebuild
+++ b/dev-python/python-ctags/python-ctags-1.5.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 MY_PN="${PN}3"
 DESCRIPTION="Exuberant Ctags indexing python bindings"
-HOMEPAGE="https://github.com/jonashaag/python-ctags3"
+HOMEPAGE="https://github.com/universal-ctags/python-ctags3"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"