diff --git a/Doc/faq/index.rst b/Doc/faq/index.rst
index b9565219b70..46ed3db2203 100644
--- a/Doc/faq/index.rst
+++ b/Doc/faq/index.rst
@@ -1,3 +1,5 @@
+.. _faq-index:
+
###################################
Python Frequently Asked Questions
###################################
diff --git a/Doc/tutorial/whatnow.rst b/Doc/tutorial/whatnow.rst
index ac1721db98b..7fcbdc3f448 100644
--- a/Doc/tutorial/whatnow.rst
+++ b/Doc/tutorial/whatnow.rst
@@ -59,9 +59,8 @@ python-list@python.org. The newsgroup and mailing list are gatewayed, so
messages posted to one will automatically be forwarded to the other. There are
around 120 postings a day (with peaks up to several hundred), asking (and
answering) questions, suggesting new features, and announcing new modules.
-Before posting, be sure to check the list of `Frequently Asked Questions
-`_ (also called the FAQ),
-or look for it in the :file:`Misc/` directory of the Python source distribution.
+Before posting, be sure to check the list of :ref:`Frequently Asked Questions
+` (also called the FAQ).
Mailing list archives are available at http://mail.python.org/pipermail/.
The FAQ answers many of the questions that come up again and again,
and may already contain the solution for your problem.