diff --git a/Doc/README.rst b/Doc/README.rst
index dcd3d6e..9156e7d 100644
--- a/Doc/README.rst
+++ b/Doc/README.rst
@@ -7,7 +7,7 @@
 
 Documentation on authoring Python documentation, including information about
 both style and markup, is available in the "`Documenting Python
-<https://docs.python.org/devguide/documenting.html>`_" chapter of the
+<https://devguide.python.org/documenting/>`_" chapter of the
 developers guide.
 
 
@@ -109,10 +109,10 @@
 Contributing
 ============
 
-Bugs in the content should be reported to the 
+Bugs in the content should be reported to the
 `Python bug tracker <https://bugs.python.org>`_.
 
-Bugs in the toolset should be reported in the 
+Bugs in the toolset should be reported in the
 `Sphinx bug tracker <https://github.com/sphinx-doc/sphinx/issues>`_.
 
 You can also send a mail to the Python Documentation Team at docs@python.org,
diff --git a/Doc/bugs.rst b/Doc/bugs.rst
index 1b0a5a9..bc1d10f 100644
--- a/Doc/bugs.rst
+++ b/Doc/bugs.rst
@@ -88,5 +88,5 @@
 any and all questions pertaining to the process of fixing issues in Python.
 
 .. _Documentation bugs: https://bugs.python.org/issue?@filter=status&@filter=components&components=4&status=1&@columns=id,activity,title,status&@sort=-activity
-.. _Python Developer's Guide: https://docs.python.org/devguide/
+.. _Python Developer's Guide: https://devguide.python.org/
 .. _core-mentorship mailing list: https://mail.python.org/mailman/listinfo/core-mentorship/
diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
index 8f6a907..d4a97fd 100644
--- a/Doc/faq/general.rst
+++ b/Doc/faq/general.rst
@@ -167,7 +167,7 @@
 and run out of the box on most UNIX platforms.
 
 Consult the `Getting Started section of the Python Developer's Guide
-<https://docs.python.org/devguide/setup.html>`__ for more
+<https://devguide.python.org/setup/>`__ for more
 information on getting the source code and compiling it.
 
 
@@ -223,7 +223,7 @@
 news is available.
 
 You can also access the development version of Python through Git.  See
-`The Python Developer's Guide <https://docs.python.org/devguide/>`_ for details.
+`The Python Developer's Guide <https://devguide.python.org/>`_ for details.
 
 
 How do I submit bug reports and patches for Python?
@@ -239,7 +239,7 @@
 `password reset procedure <https://bugs.python.org/user?@template=forgotten>`_.
 
 For more information on how Python is developed, consult `the Python Developer's
-Guide <https://docs.python.org/devguide/>`_.
+Guide <https://devguide.python.org/>`_.
 
 
 Are there any published articles about Python that I can reference?
diff --git a/Doc/howto/curses.rst b/Doc/howto/curses.rst
index cbff841..1d3bfb8 100644
--- a/Doc/howto/curses.rst
+++ b/Doc/howto/curses.rst
@@ -538,7 +538,7 @@
 implement, but because no one has needed them yet.  Also, Python
 doesn't yet support the menu library associated with ncurses.
 Patches adding support for these would be welcome; see
-`the Python Developer's Guide <https://docs.python.org/devguide/>`_ to
+`the Python Developer's Guide <https://devguide.python.org/>`_ to
 learn more about submitting patches to Python.
 
 * `Writing Programs with NCURSES <http://invisible-island.net/ncurses/ncurses-intro.html>`_:
diff --git a/Doc/using/unix.rst b/Doc/using/unix.rst
index 604688c..8b96ebe 100644
--- a/Doc/using/unix.rst
+++ b/Doc/using/unix.rst
@@ -67,7 +67,7 @@
 If you want to compile CPython yourself, first thing you should do is get the
 `source <https://www.python.org/downloads/source/>`_. You can download either the
 latest release's source or just grab a fresh `clone
-<https://docs.python.org/devguide/setup.html#getting-the-source-code>`_.  (If you want
+<https://devguide.python.org/setup/#getting-the-source-code>`_.  (If you want
 to contribute patches, you will need a clone.)
 
 The build process consists in the usual ::
@@ -140,4 +140,4 @@
 
 Please go to `Python Editors <https://wiki.python.org/moin/PythonEditors>`_ and
 `Integrated Development Environments <https://wiki.python.org/moin/IntegratedDevelopmentEnvironments>`_
-for a comprehensive list.
\ No newline at end of file
+for a comprehensive list.
diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
index 68687e9..3d47d7c 100644
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -896,7 +896,7 @@
 If you want to compile CPython yourself, first thing you should do is get the
 `source <https://www.python.org/downloads/source/>`_. You can download either the
 latest release's source or just grab a fresh `checkout
-<https://docs.python.org/devguide/setup.html#getting-the-source-code>`_.
+<https://devguide.python.org/setup/#getting-the-source-code>`_.
 
 The source tree contains a build solution and project files for Microsoft
 Visual Studio 2015, which is the compiler used to build the official Python
diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index cc2fa3d..45b0ab9 100644
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -232,7 +232,7 @@
 
 .. seealso::
 
-   `Documenting Python <https://docs.python.org/devguide/documenting.html>`__
+   `Documenting Python <https://devguide.python.org/documenting/>`__
        Describes how to write for Python's documentation.
 
    `Sphinx <http://sphinx-doc.org/>`__
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
index 72398f9..6597170 100644
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -1960,7 +1960,7 @@
   ``.py`` extension.  (Contributed by Paul Moore in :issue:`18569`.)
 
 * A new ``make`` target `coverage-report
-  <https://docs.python.org/devguide/coverage.html#measuring-coverage-of-c-code-with-gcov-and-lcov>`_
+  <https://devguide.python.org/coverage/#measuring-coverage-of-c-code-with-gcov-and-lcov>`_
   will build python, run the test suite, and generate an HTML coverage report
   for the C codebase using ``gcov`` and `lcov
   <http://ltp.sourceforge.net/coverage/lcov.php>`_.
@@ -2176,7 +2176,7 @@
 removed:
 
 * The unmaintained ``Misc/TextMate`` and ``Misc/vim`` directories have been
-  removed (see the `devguide <https://docs.python.org/devguide>`_
+  removed (see the `devguide <https://devguide.python.org>`_
   for suggestions on what to use instead).
 
 * The ``SO`` makefile macro is removed (it was replaced by the
diff --git a/Grammar/Grammar b/Grammar/Grammar
index 59c807e..9058243 100644
--- a/Grammar/Grammar
+++ b/Grammar/Grammar
@@ -1,7 +1,7 @@
 # Grammar for Python
 
 # NOTE WELL: You should also follow all the steps listed at
-# https://docs.python.org/devguide/grammar.html
+# https://devguide.python.org/grammar/
 
 # Start symbols for the grammar:
 #       single_input is a single interactive statement;
diff --git a/Mac/README b/Mac/README
index 07f09fa..d419474 100644
--- a/Mac/README
+++ b/Mac/README
@@ -98,7 +98,7 @@
 Apple-supplied compilers and other build tools included in Apple's Xcode
 development tools.  You should install Xcode and the command line tools
 component appropriate for the OS X release you are running on.  See the
-Python Developer's Guide (http://docs.python.org/devguide/setup.html)
+Python Developer's Guide (https://devguide.python.org/setup/)
 for more information.
 
 2.1 Flavors of universal binaries
@@ -355,4 +355,4 @@
 
   *  http://www.python.org/community/sigs/current/pythonmac-sig/
 
-  *  http://docs.python.org/devguide/
\ No newline at end of file
+  *  https://devguide.python.org/
diff --git a/Misc/ACKS b/Misc/ACKS
index 91e0424..e1127bc 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -627,6 +627,7 @@
 Bernhard Herzog
 Magnus L. Hetland
 Raymond Hettinger
+Lisa Hewus Fresh
 Kevan Heydon
 Wouter van Heyst
 Kelsey Hightower
diff --git a/Misc/Porting b/Misc/Porting
index c43b112..f16c460 100644
--- a/Misc/Porting
+++ b/Misc/Porting
@@ -1 +1 @@
-This document is moved to https://docs.python.org/devguide/faq.html#how-do-i-port-python-to-a-new-platform
+This document is moved to https://devguide.python.org/porting/
diff --git a/Misc/python.man b/Misc/python.man
index 385b654..075b974 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -438,7 +438,7 @@
 .br
 Documentation:  https://docs.python.org/
 .br
-Developer resources:  https://docs.python.org/devguide/
+Developer resources:  https://devguide.python.org/
 .br
 Downloads:  https://www.python.org/downloads/
 .br
diff --git a/README.rst b/README.rst
index 9c95815..4829271 100644
--- a/README.rst
+++ b/README.rst
@@ -28,7 +28,7 @@
 - Source code: https://github.com/python/cpython
 - Issue tracker: https://bugs.python.org
 - Documentation: https://docs.python.org
-- Developer's Guide: https://docs.python.org/devguide/
+- Developer's Guide: https://devguide.python.org/
 
 Contributing to CPython
 -----------------------
@@ -36,7 +36,7 @@
 For more complete instructions on contributing to CPython development,
 see the `Developer Guide`_.
 
-.. _Developer Guide: https://docs.python.org/devguide/
+.. _Developer Guide: https://devguide.python.org/
 
 Using Python
 ------------