diff --git a/dev-python/pep8/metadata.xml b/dev-python/pep8/metadata.xml
index 5a52c4a85bad6..2eb1288b3c1e3 100644
--- a/dev-python/pep8/metadata.xml
+++ b/dev-python/pep8/metadata.xml
@@ -8,6 +8,6 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pep8</remote-id>
-    <remote-id type="github">jcrocholl/pep8</remote-id>
+    <remote-id type="github">PyCQA/pycodestyle</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pep8/pep8-1.7.1.ebuild b/dev-python/pep8/pep8-1.7.1.ebuild
index b8c60182e6550..82e6438930b11 100644
--- a/dev-python/pep8/pep8-1.7.1.ebuild
+++ b/dev-python/pep8/pep8-1.7.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python style guide checker"
-HOMEPAGE="https://github.com/PyCQA/pep8 https://pypi.org/project/pep8/"
+HOMEPAGE="https://github.com/PyCQA/pycodestyle/ https://pypi.org/project/pep8/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"