diff --git a/Lib/distutils/command/register.py b/Lib/distutils/command/register.py
index 5fcc8d27647..200e61e2409 100644
--- a/Lib/distutils/command/register.py
+++ b/Lib/distutils/command/register.py
@@ -17,7 +17,7 @@ class register(Command):
 
     description = ("register the distribution with the Python package index")
 
-    DEFAULT_REPOSITORY = 'http://www.python.org/pypi'
+    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
 
     user_options = [
         ('repository=', 'r',
diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
index 67ba080427c..7461e5f4534 100644
--- a/Lib/distutils/command/upload.py
+++ b/Lib/distutils/command/upload.py
@@ -20,7 +20,7 @@ class upload(Command):
 
     description = "upload binary package to PyPI"
 
-    DEFAULT_REPOSITORY = 'http://www.python.org/pypi'
+    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
 
     user_options = [
         ('repository=', 'r',
diff --git a/Misc/NEWS b/Misc/NEWS
index e88fb2aebcd..8ca898b469d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -26,6 +26,8 @@ Core and builtins
 Library
 -------
 
+- Change location of the package index to pypi.python.org/pypi
+
 - Bug #1701409: Fix a segfault in printing ctypes.c_char_p and
   ctypes.c_wchar_p when they point to an invalid location.  As a
   sideeffect the representation of these instances has changed.