diff --git a/CHANGES.rst b/CHANGES.rst
index be52f56f95..a45575ac17 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,28 @@
 CHANGES
 =======
 
+v27.0.0
+-------
+
+* Now use Warehouse by default for
+  ``upload``, patching ``distutils.config.PyPIRCCommand`` to
+  affect default behavior.
+
+  Any config in .pypirc should be updated to replace
+
+    https://pypi.python.org/pypi/
+
+  with
+
+    https://upload.pypi.org/legacy/
+
+  Similarly, any passwords stored in the keyring should be
+  updated to use this new value for "system".
+
+  The ``upload_docs`` command will continue to use the python.org
+  site, but the command is now deprecated. Users are urged to use
+  Read The Docs instead.
+
 v26.1.1
 -------
 
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 4270394744..2ca971038b 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -183,3 +183,20 @@ def findall(dir=os.curdir):
 if has_issue_12885:
     # fix findall bug in distutils (http://bugs.python.org/issue12885)
     distutils.filelist.findall = findall
+
+
+needs_warehouse = (
+    sys.version_info < (2, 7, 13)
+    or
+    (3, 0) < sys.version_info < (3, 3, 7)
+    or
+    (3, 4) < sys.version_info < (3, 4, 6)
+    or
+    (3, 5) < sys.version_info <= (3, 5, 3)
+    or
+    (3, 6) < sys.version_info
+)
+
+if needs_warehouse:
+    warehouse = 'https://upload.pypi.org/legacy/'
+    distutils.config.PyPIRCCommand.DEFAULT_REPOSITORY = warehouse
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py
index ccc1c76ffc..269dc2d503 100644
--- a/setuptools/command/upload_docs.py
+++ b/setuptools/command/upload_docs.py
@@ -29,6 +29,10 @@ def _encode(s):
 
 
 class upload_docs(upload):
+    # override the default repository as upload_docs isn't
+    # supported by Warehouse (and won't be).
+    DEFAULT_REPOSITORY = 'https://pypi.python.org/pypi/'
+
     description = 'Upload documentation to PyPI'
 
     user_options = [
@@ -53,6 +57,7 @@ def initialize_options(self):
         self.target_dir = None
 
     def finalize_options(self):
+        log.warn("Upload_docs command is deprecated. Use RTD instead.")
         upload.finalize_options(self)
         if self.upload_dir is None:
             if self.has_sphinx():