diff --git a/source/guides/migrating-to-pypi-org.rst b/source/guides/migrating-to-pypi-org.rst
index 15fa006e7..11c90f93d 100644
--- a/source/guides/migrating-to-pypi-org.rst
+++ b/source/guides/migrating-to-pypi-org.rst
@@ -87,9 +87,11 @@ uploading artifacts.
 Using TestPyPI
 --------------
 
-If you use TestPyPI, you must update your ``$HOME/.pypirc`` to handle
-TestPyPI's new location, by replacing ``https://testpypi.python.org/pypi``
-with ``https://test.pypi.org/legacy/``, for example:
+Legacy TestPyPI (testpypi.python.org) is no longer available; use
+`test.pypi.org <https://test.pypi.org>`_ instead. If you use TestPyPI,
+you must update your ``$HOME/.pypirc`` to handle TestPyPI's new
+location, by replacing ``https://testpypi.python.org/pypi`` with
+``https://test.pypi.org/legacy/``, for example:
 
 .. code::
 
@@ -132,3 +134,11 @@ Managing published packages and releases
 ``pypi.org`` provides a fully functional interface for logged in users to
 manage their published packages and releases.
 
+Visiting legacy PyPI
+--------------------
+
+A temporary installation of the legacy PyPI codebase is `available at
+legacy.pypi.org <http://legacy.pypi.org/>`_ until 30 April 2018, when
+it will be shut down. It reads from the same database backend and file
+store as pypi.org. See `the Warehouse roadmap
+<https://wiki.python.org/psf/WarehouseRoadmap>`_ for further details.
diff --git a/source/guides/tool-recommendations.rst b/source/guides/tool-recommendations.rst
index e4d9d4481..3180e493d 100644
--- a/source/guides/tool-recommendations.rst
+++ b/source/guides/tool-recommendations.rst
@@ -48,21 +48,19 @@ Packaging tool recommendations
   :ref:`wheel project <wheel>` to create :term:`wheels <Wheel>`.  This is
   especially beneficial, if your project contains binary extensions.
 
-* Use `twine <https://pypi.python.org/pypi/twine>`_ for uploading distributions
+* Use `twine <https://pypi.org/project/twine>`_ for uploading distributions
   to :term:`PyPI <Python Package Index (PyPI)>`.
 
 
 Publishing platform migration
 =============================
 
-The original Python Package Index implementation (hosted at
-`pypi.python.org <https://pypi.python.org>`_) is being phased out in favour
-of an updated implementation hosted at `pypi.org <https://pypi.org>`_. Both
-interfaces share a common database backend and file store, allowing the latter
-to assume more default responsibilities as it becomes more capable.
+The original Python Package Index implementation (previously hosted at
+`pypi.python.org <https://pypi.python.org>`_) has been phased out in favour
+of an updated implementation hosted at `pypi.org <https://pypi.org>`_.
 
-See :ref:`Migrating to PyPI.org` for more information on the current status of
-the migration, and the required settings for opting in to the migration early.
+See :ref:`Migrating to PyPI.org` for more information on the status of the
+migration, and what settings to change in your clients.
 
 ----
 
diff --git a/source/specifications/core-metadata.rst b/source/specifications/core-metadata.rst
index 513d6c424..e97289d92 100644
--- a/source/specifications/core-metadata.rst
+++ b/source/specifications/core-metadata.rst
@@ -409,7 +409,7 @@ Classifier (multiple use)
 Each entry is a string giving a single classification value
 for the distribution.  Classifiers are described in :pep:`301`,
 and the Python Package Index publishes a dynamic list of
-`currently defined classifiers <https://pypi.python.org/pypi?%3Aaction=list_classifiers>`__.
+`currently defined classifiers <https://pypi.org/pypi?%3Aaction=list_classifiers>`__.
 
 This field may be followed by an environment marker after a semicolon.
 
@@ -638,7 +638,7 @@ It is legal to specify ``Provides-Extra:`` without referencing it in any
 .. [1] reStructuredText markup:
    http://docutils.sourceforge.net/
 
-.. _`Python Package Index`: http://pypi.python.org/pypi/
+.. _`Python Package Index`: http://pypi.org/
 
 .. [2] RFC 822 Long Header Fields:
    http://www.freesoft.org/CIE/RFC/822/7.htm