diff --git a/AUTHORS b/AUTHORS
index 6f8355d1..cb949033 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,3 @@
-
 Contributors
 ------------
 
@@ -18,3 +17,6 @@ Contributors
 * Marcin Cieślak
 * Steven Myint
 * Ignas Mikalajūnas
+
+See also the contributors list on GitHub:
+https://github.com/pyflakes/pyflakes/graphs/contributors
diff --git a/setup.py b/setup.py
index b5ab878b..c6dd8775 100755
--- a/setup.py
+++ b/setup.py
@@ -40,11 +40,9 @@ def get_long_description():
     version=get_version(),
     description="passive checker of Python programs",
     long_description=get_long_description(),
-    author="Phil Frost",
-    author_email="indigo@bitglue.com",
-    maintainer="Florent Xicluna",
-    maintainer_email="pyflakes-dev@lists.launchpad.net",
-    url="https://launchpad.net/pyflakes",
+    author="A lot of people",
+    author_email="code-quality@python.org",
+    url="https://github.com/pyflakes/pyflakes",
     packages=["pyflakes", "pyflakes.scripts", "pyflakes.test"],
     classifiers=[
         "Development Status :: 6 - Mature",