diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
index cc2cbda0ae8..82e7a74c674 100644
--- a/Doc/faq/general.rst
+++ b/Doc/faq/general.rst
@@ -269,9 +269,10 @@ Where in the world is www.python.org located?
 ---------------------------------------------
 
 The Python project's infrastructure is located all over the world.
-www.python.org is currently in Amsterdam, graciously hosted by `XS4ALL
-<http://www.xs4all.nl>`_.  `Upfront Systems <http://www.upfrontsystems.co.za>`_
-hosts bugs.python.org.  Most other Python services like `PyPI
+`www.python.org <http://www.python.org>`_ is currently in Amsterdam, graciously
+hosted by `XS4ALL <http://www.xs4all.nl>`_.  `Upfront Systems
+<http://www.upfrontsystems.co.za>`_ hosts `bugs.python.org
+<http://bugs.python.org>`_.  Most other Python services like `PyPI
 <https://pypi.python.org>`_ and hg.python.org are hosted by `Oregon State
 University Open Source Lab <https://osuosl.org>`_.