diff --git a/doc/en/changelog.rst b/doc/en/changelog.rst
index 2c07f208a..8e3efd047 100644
--- a/doc/en/changelog.rst
+++ b/doc/en/changelog.rst
@@ -3360,7 +3360,9 @@ Bug Fixes
 - :issue:`5914`: pytester: fix :py:func:`~pytest.LineMatcher.no_fnmatch_line` when used after positive matching.
 
 
-- :issue:`6082`: Fix line detection for doctest samples inside :py:class:`python:property` docstrings, as a workaround to :bpo:`17446`.
+- :issue:`6082`: Fix line detection for doctest samples inside
+  :py:class:`python:property` docstrings, as a workaround to
+  :issue:`python/cpython#61648`.
 
 
 - :issue:`6254`: Fix compatibility with pytest-parallel (regression in pytest 5.3.0).
diff --git a/doc/en/conf.py b/doc/en/conf.py
index 7ec862a60..0d440ec44 100644
--- a/doc/en/conf.py
+++ b/doc/en/conf.py
@@ -82,7 +82,6 @@ extensions = [
     "pygments_pytest",
     "sphinx.ext.autodoc",
     "sphinx.ext.autosummary",
-    "sphinx.ext.extlinks",
     "sphinx.ext.intersphinx",
     "sphinx.ext.todo",
     "sphinx.ext.viewcode",
@@ -171,11 +170,6 @@ linkcheck_ignore = [
 linkcheck_workers = 5
 
 
-extlinks = {
-    "bpo": ("https://bugs.python.org/issue%s", "bpo-%s"),
-}
-
-
 nitpicky = True
 nitpick_ignore = [
     # TODO (fix in pluggy?)