diff --git a/doc/notes/notes-9.17.3.rst b/doc/notes/notes-9.17.3.rst
index b658faf299..a50c878f1f 100644
--- a/doc/notes/notes-9.17.3.rst
+++ b/doc/notes/notes-9.17.3.rst
@@ -31,7 +31,7 @@ Feature Changes
   programs that interact with the network and process arbitrary user
   input. [GL #1933]
 
-- As part of an ongoing effort to use RFC 8499 terminology,
+- As part of an ongoing effort to use :rfc:`8499` terminology,
   ``primaries`` can now be used as a synonym for ``masters`` in
   ``named.conf``. Similarly, ``notify primary-only`` can now be used as
   a synonym for ``notify master-only``. The output of ``rndc
diff --git a/doc/notes/notes-9.17.9.rst b/doc/notes/notes-9.17.9.rst
index d702519775..b5bb532ee4 100644
--- a/doc/notes/notes-9.17.9.rst
+++ b/doc/notes/notes-9.17.9.rst
@@ -23,7 +23,7 @@ Feature Changes
   without making it bogus in the process; changing to ``dnssec-policy
   none;`` also causes CDS and CDNSKEY DELETE records to be published, to
   signal that the entire DS RRset at the parent must be removed, as
-  described in RFC 8078. [GL #1750]
+  described in :rfc:`8078`. [GL #1750]
 
 - When using the ``unixtime`` or ``date`` method to update the SOA
   serial number, ``named`` and ``dnssec-signzone`` silently fell back to
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index faa950b8d1..5b3b150abf 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -88,7 +88,7 @@ Feature Changes
 
 - The default value of ``max-stale-ttl`` has been changed from 12 hours to 1
   day and the default value of ``stale-answer-ttl`` has been changed from 1
-  second to 30 seconds, following RFC 8767 recommendations. [GL #2248]
+  second to 30 seconds, following :rfc:`8767` recommendations. [GL #2248]
 
 - When ``check-names`` is in effect, A records below an ``_spf``, ``_spf_rate``
   and ``_spf_verify`` labels (which are employed by the ``exists`` SPF