diff --git a/dev-python/greenstalk/greenstalk-1.0.1.ebuild b/dev-python/greenstalk/greenstalk-1.0.1.ebuild
index 411e09a24d64a..5893528dd00aa 100644
--- a/dev-python/greenstalk/greenstalk-1.0.1.ebuild
+++ b/dev-python/greenstalk/greenstalk-1.0.1.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="A Python 3 client for the beanstalkd work queue"
-HOMEPAGE="https://greenstalk.readthedocs.io/ https://github.com/mayhewj/greenstalk"
-SRC_URI="https://github.com/mayhewj/greenstalk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://greenstalk.readthedocs.io/ https://github.com/justinmayhew/greenstalk"
+SRC_URI="https://github.com/justinmayhew/greenstalk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/greenstalk/metadata.xml b/dev-python/greenstalk/metadata.xml
index 1c4b1a9121ed5..ee3916a8ff892 100644
--- a/dev-python/greenstalk/metadata.xml
+++ b/dev-python/greenstalk/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">mayhewj/greenstalk</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="pypi">greenstalk</remote-id>
+		<remote-id type="github">justinmayhew/greenstalk</remote-id>
+	</upstream>
 </pkgmetadata>