diff --git a/setup.py b/setup.py
index de659815..aa19ef8d 100755
--- a/setup.py
+++ b/setup.py
@@ -30,9 +30,14 @@
         ]},
     'author': 'Wim Meeussen, Dirk Thomas',
     'author_email': 'wim@hidof.com, dthomas@osrfoundation.org',
-    'maintainer': 'Dirk Thomas',
-    'maintainer_email': 'dthomas@osrfoundation.org',
+    'maintainer': 'ROS Infrastructure Team',
     'url': 'http://wiki.ros.org/rosdistro',
+    'project_urls': {
+        'Source code':
+        'https://github.com/ros-infrastructure/rosdistro',
+        'Issue tracker':
+        'https://github.com/ros-infrastructure/rosdistro/issues',
+    },
     'keywords': ['ROS'],
     'classifiers': [
         'Programming Language :: Python',