diff --git a/tests/valid/draft-miek-test.v2v3.xml b/tests/valid/draft-miek-test.v2v3.xml
index 47ea604b3..852deac8c 100644
--- a/tests/valid/draft-miek-test.v2v3.xml
+++ b/tests/valid/draft-miek-test.v2v3.xml
@@ -6,7 +6,7 @@
   <!ENTITY wj     "&#8288;">
 ]>
 <rfc xmlns:xi="http://www.w3.org/2001/XInclude" ipr="trust200902" category="info" docName="draft-gieben-writing-rfcs-pandoc-02" obsoletes="" updates="" submissionType="IETF" xml:lang="en" tocInclude="true" symRefs="true" sortRefs="true" version="3">
-  <!-- xml2rfc v2v3 conversion 3.12.3 -->
+  <!-- xml2rfc v2v3 conversion 3.12.10 -->
   <!--generate a table of contents -->
    <!--use anchors instead of numbers for references -->
    <!--alphabetize the references -->
@@ -867,8 +867,8 @@ draft-gieben-writing-rfcs-pandoc-00.txt -> draft.txt
       </references>
       <references>
         <name>Normative References</name>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4641.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4641.xml"/>
       </references>
     </references>
     <!--This document was prepared using Pandoc2rfc https://github.com/miekg/pandoc2rfc -->
diff --git a/tests/valid/draft-miek-test.v3add-xinclude.xml b/tests/valid/draft-miek-test.v3add-xinclude.xml
index 97eede192..0bf3ddb39 100644
--- a/tests/valid/draft-miek-test.v3add-xinclude.xml
+++ b/tests/valid/draft-miek-test.v3add-xinclude.xml
@@ -867,13 +867,13 @@ draft-gieben-writing-rfcs-pandoc-00.txt -> draft.txt
       </references>
       <references>
         <name>Normative References</name>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4641.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4641.xml"/>
       </references>
       <references>
         <name>Informative References (by reference)</name>
         <!-- bibxml reference -->
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4941.xml"/><!-- bibxml-misc reference -->
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4941.xml"/><!-- bibxml-misc reference -->
         <reference anchor="ISO.8327.1990" xml:base="https://xml2rfc.tools.ietf.org/public/rfc/bibxml-misc/reference.ISO.8327.1990.xml">
 <front>
 <title>Information processing systems - Open Systems Interconnection - Basic connection oriented session protocol specification</title>
diff --git a/tests/valid/draft-template.v2v3.xml b/tests/valid/draft-template.v2v3.xml
index 15376ac08..ad3f7bb0e 100644
--- a/tests/valid/draft-template.v2v3.xml
+++ b/tests/valid/draft-template.v2v3.xml
@@ -35,7 +35,7 @@
 <?rfc multiple-initials="yes" ?>
 <!-- end of list of popular I-D processing instructions -->
 <rfc xmlns:xi="http://www.w3.org/2001/XInclude" category="info" docName="draft-ietf-xml2rfc-template-05" ipr="trust200902" obsoletes="" updates="" submissionType="IETF" xml:lang="en" tocInclude="true" tocDepth="4" symRefs="true" sortRefs="true" version="3">
-  <!-- xml2rfc v2v3 conversion 3.12.1 -->
+  <!-- xml2rfc v2v3 conversion 3.12.10 -->
   <?v3xml2rfc silence=".*[Pp]ostal address" ?>
   <?v3xml2rfc silence="The document date .*? is more than 3 days away from today's date" ?>
   <?v3xml2rfc silence="Found SVG with width or height specified" ?>
@@ -451,7 +451,7 @@ main(int argc, char *argv[])
       <references>
         <name>Normative References</name>
         <!--?rfc include="http://xml.resource.org/public/rfc/bibxml/reference.RFC.2119.xml"?-->
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
         <reference anchor="min_ref">
           <!-- the following is the minimum to make xml2rfc happy -->
 
@@ -468,8 +468,8 @@ main(int argc, char *argv[])
         <name>Informative References</name>
         <!-- Here we use entities that we defined at the beginning. -->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.2629.xml"/>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.3552.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.2629.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.3552.xml"/>
         <xi:include href="https://datatracker.ietf.org/doc/bibxml3/draft-narten-iana-considerations-rfc2434bis.xml"/>
         <!-- Reference with query argument -->
       <reference anchor="JUPITER" xml:base="https://xml2rfc.tools.ietf.org/public/rfc/bibxml-doi/reference.DOI.10.1145/2975159.xml?anchor=JUPITER">
diff --git a/tests/valid/draft-template.v3add-xinclude.xml b/tests/valid/draft-template.v3add-xinclude.xml
index 97eede192..0bf3ddb39 100644
--- a/tests/valid/draft-template.v3add-xinclude.xml
+++ b/tests/valid/draft-template.v3add-xinclude.xml
@@ -867,13 +867,13 @@ draft-gieben-writing-rfcs-pandoc-00.txt -> draft.txt
       </references>
       <references>
         <name>Normative References</name>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4641.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4641.xml"/>
       </references>
       <references>
         <name>Informative References (by reference)</name>
         <!-- bibxml reference -->
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4941.xml"/><!-- bibxml-misc reference -->
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4941.xml"/><!-- bibxml-misc reference -->
         <reference anchor="ISO.8327.1990" xml:base="https://xml2rfc.tools.ietf.org/public/rfc/bibxml-misc/reference.ISO.8327.1990.xml">
 <front>
 <title>Information processing systems - Open Systems Interconnection - Basic connection oriented session protocol specification</title>
diff --git a/tests/valid/indexes.pages.text b/tests/valid/indexes.pages.text
index aa49c7125..abe14b51d 100644
--- a/tests/valid/indexes.pages.text
+++ b/tests/valid/indexes.pages.text
@@ -3,9 +3,9 @@
 
 
 Network Working Group                                     H. Person, Ed.
-Internet-Draft                                             June 16, 2022
+Internet-Draft                                             June 20, 2022
 Intended status: Experimental                                           
-Expires: December 18, 2022
+Expires: December 22, 2022
 
 
                           xml2rfc index tests
@@ -26,7 +26,7 @@ Status of This Memo
    time.  It is inappropriate to use Internet-Drafts as reference
    material or to cite them other than as "work in progress."
 
-   This Internet-Draft will expire on December 18, 2022.
+   This Internet-Draft will expire on December 22, 2022.
 
 Copyright Notice
 
@@ -53,7 +53,7 @@ Table of Contents
 
 
 
-Person                  Expires December 18, 2022               [Page 1]
+Person                  Expires December 22, 2022               [Page 1]
 
 Internet-Draft             xml2rfc index tests                 June 2022
 
@@ -109,7 +109,7 @@ Index
 
 
 
-Person                  Expires December 18, 2022               [Page 2]
+Person                  Expires December 22, 2022               [Page 2]
 
 Internet-Draft             xml2rfc index tests                 June 2022
 
@@ -165,4 +165,4 @@ Author's Address
 
 
 
-Person                  Expires December 18, 2022               [Page 3]
+Person                  Expires December 22, 2022               [Page 3]
diff --git a/tests/valid/indexes.prepped.xml b/tests/valid/indexes.prepped.xml
index a7270b0dd..6e17a8d72 100644
--- a/tests/valid/indexes.prepped.xml
+++ b/tests/valid/indexes.prepped.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" category="exp" docName="indexes-00" indexInclude="true" ipr="trust200902" prepTime="2022-06-16T04:34:05" scripts="Common,Latin" sortRefs="true" submissionType="independent" symRefs="true" tocDepth="3" tocInclude="true">
+<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" category="exp" docName="indexes-00" indexInclude="true" ipr="trust200902" prepTime="2022-06-20T23:09:07" scripts="Common,Latin" sortRefs="true" submissionType="independent" symRefs="true" tocDepth="3" tocInclude="true">
   <!-- xml2rfc v2v3 conversion 3.12.10 -->
   
     
@@ -20,7 +20,7 @@
         </postal>
       </address>
     </author>
-    <date day="16" month="06" year="2022"/>
+    <date day="20" month="06" year="2022"/>
     <boilerplate>
       <section anchor="status-of-memo" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.1">
         <name slugifiedName="name-status-of-this-memo">Status of This Memo</name>
@@ -41,7 +41,7 @@
         material or to cite them other than as "work in progress."
         </t>
         <t indent="0" pn="section-boilerplate.1-4">
-        This Internet-Draft will expire on 18 December 2022.
+        This Internet-Draft will expire on 22 December 2022.
         </t>
       </section>
       <section anchor="copyright" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.2">
diff --git a/tests/valid/indexes.text b/tests/valid/indexes.text
index 98a9cf7b8..43da998c6 100644
--- a/tests/valid/indexes.text
+++ b/tests/valid/indexes.text
@@ -3,9 +3,9 @@
 
 
 Network Working Group                                     H. Person, Ed.
-Internet-Draft                                             June 16, 2022
+Internet-Draft                                             June 20, 2022
 Intended status: Experimental                                           
-Expires: December 18, 2022
+Expires: December 22, 2022
 
 
                           xml2rfc index tests
@@ -26,7 +26,7 @@ Status of This Memo
    time.  It is inappropriate to use Internet-Drafts as reference
    material or to cite them other than as "work in progress."
 
-   This Internet-Draft will expire on December 18, 2022.
+   This Internet-Draft will expire on December 22, 2022.
 
 Copyright Notice
 
diff --git a/tests/valid/indexes.v3.html b/tests/valid/indexes.v3.html
index fd130eae8..d24c5875e 100644
--- a/tests/valid/indexes.v3.html
+++ b/tests/valid/indexes.v3.html
@@ -23,7 +23,7 @@
 </tr></thead>
 <tfoot><tr>
 <td class="left">Person</td>
-<td class="center">Expires December 18, 2022</td>
+<td class="center">Expires December 22, 2022</td>
 <td class="right">[Page]</td>
 </tr></tfoot>
 </table>
@@ -36,12 +36,12 @@
 <dd class="internet-draft">indexes-00</dd>
 <dt class="label-published">Published:</dt>
 <dd class="published">
-<time datetime="2022-06-16" class="published">June 16, 2022</time>
+<time datetime="2022-06-20" class="published">June 20, 2022</time>
     </dd>
 <dt class="label-intended-status">Intended Status:</dt>
 <dd class="intended-status">Experimental</dd>
 <dt class="label-expires">Expires:</dt>
-<dd class="expires"><time datetime="2022-12-18">December 18, 2022</time></dd>
+<dd class="expires"><time datetime="2022-12-22">December 22, 2022</time></dd>
 <dt class="label-authors">Author:</dt>
 <dd class="authors">
 <div class="author">
@@ -71,7 +71,7 @@ <h2 id="name-status-of-this-memo">
         time. It is inappropriate to use Internet-Drafts as reference
         material or to cite them other than as "work in progress."<a href="#section-boilerplate.1-3" class="pilcrow">¶</a></p>
 <p id="section-boilerplate.1-4">
-        This Internet-Draft will expire on December 18, 2022.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
+        This Internet-Draft will expire on December 22, 2022.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
 </section>
 </div>
 <div id="copyright">
diff --git a/tests/valid/manpage.txt b/tests/valid/manpage.txt
index cab8f55a9..c65de436c 100644
--- a/tests/valid/manpage.txt
+++ b/tests/valid/manpage.txt
@@ -1,5 +1,5 @@
 xml2rfc(1)                                                    xml2rfc(1)
-                                                            16 June 2022
+                                                            20 June 2022
 
 
                   Xml2rfc Vocabulary Version 3 Schema
diff --git a/tests/valid/rfc6787.v2v3.xml b/tests/valid/rfc6787.v2v3.xml
index b0361458e..3b247f5d5 100644
--- a/tests/valid/rfc6787.v2v3.xml
+++ b/tests/valid/rfc6787.v2v3.xml
@@ -15,7 +15,7 @@
 <?rfc autobreaks="yes"?>
 <?rfc docmapping="yes"?>
 <rfc xmlns:xi="http://www.w3.org/2001/XInclude" number="6787" category="std" consensus="true" docName="draft-ietf-speechsc-mrcpv2" ipr="pre5378Trust200902" submissionType="IETF" obsoletes="" updates="" xml:lang="en" tocInclude="true" sortRefs="true" symRefs="true" version="3">
-  <!-- xml2rfc v2v3 conversion 3.9.1 -->
+  <!-- xml2rfc v2v3 conversion 3.12.10 -->
   <link href="https://datatracker.ietf.org/doc/draft-ietf-speechsc-mrcpv2" rel="prev"/>
   <?v3xml2rfc silence="The document date" ?>
   <?v3xml2rfc silence="The 'docName' attribute of the .rfc/. element should have a revision number" ?>
@@ -10196,76 +10196,76 @@ identification-tag =    token
         <name>Normative References</name>
         <!--RTP-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.3550.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.3550.xml"/>
         <!--SIP-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.3261.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.3261.xml"/>
         <!--RTSP-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.2326.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.2326.xml"/>
         <!--SDP: Session Description Protocol-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4566.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4566.xml"/>
         <!--TCP-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.0793.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.0793.xml"/>
         <!--Key words for use in RFCs to Indicate Requirement Levels-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
         <!--HTTP/1.1-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.2616.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.2616.xml"/>
         <!--Offer/Answer Model with Session Description Protocol (SDP)-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.3264.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.3264.xml"/>
         <!--UTF-8, a transformation format of Unicode and ISO 10646-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.3629.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.3629.xml"/>
         <!--ABNF-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.5234.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.5234.xml"/>
         <!--Connection-Oriented Media Transport in the Session Description Protocol (SDP)-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4145.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4145.xml"/>
         <!-- TLS profile for Comedia -->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4572.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4572.xml"/>
         <!--Grouping of Media Lines in the Session Description Protocol -->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.5888.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.5888.xml"/>
         <!--Internet Message Format-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.5322.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.5322.xml"/>
         <!--Content-ID and Message-ID Uniform Resource Locators-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.2392.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.2392.xml"/>
         <!--HTTP State Management Mechanism-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.6265.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.6265.xml"/>
         <!--Tags for the Identification of Languages-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.5646.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.5646.xml"/>
         <!--Guidelines for Writing an IANA Considerations Section in RFCs-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.5226.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.5226.xml"/>
         <!--TLS-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.5246.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.5246.xml"/>
         <!--Domain names - implementation and specification-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.1035.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.1035.xml"/>
         <!--Uniform Resource Identifier (URI): Generic Syntax-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.3986.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.3986.xml"/>
         <!--MIME Registration Procedures-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4288.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4288.xml"/>
         <!--IETF XML Registry-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.3688.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.3688.xml"/>
         <!--Security Descriptions for SDP-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4568.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4568.xml"/>
         <!-- Speech Synthesis-->
 
       <reference anchor="W3C.REC-speech-synthesis-20040907" target="https://www.w3.org/TR/2004/REC-speech-synthesis-20040907" xml:base="https://xml2rfc.tools.ietf.org/public/rfc/bibxml4/reference.W3C.REC-speech-synthesis-20040907.xml">
@@ -10286,16 +10286,16 @@ identification-tag =    token
         </reference>
         <!-- NTP -->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.5905.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.5905.xml"/>
         <!-- text/uri-list definition -->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.2483.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.2483.xml"/>
         <!-- SRTP -->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.3711.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.3711.xml"/>
         <!-- SIP Domain Certificates -->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.5922.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.5922.xml"/>
         <!-- Grammar -->
 
       <reference anchor="W3C.REC-speech-grammar-20040316" target="https://www.w3.org/TR/2004/REC-speech-grammar-20040316" xml:base="https://xml2rfc.tools.ietf.org/public/rfc/bibxml4/reference.W3C.REC-speech-grammar-20040316.xml">
@@ -10350,7 +10350,7 @@ identification-tag =    token
         </reference>
         <!--RFC 3023-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.3023.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.3023.xml"/>
         <!--ISO 8859-1-->
 
       <reference anchor="ISO.8859-1.1987" xml:base="https://xml2rfc.tools.ietf.org/public/rfc/bibxml2/reference.ISO.8859-1.1987.xml">
@@ -10366,14 +10366,14 @@ identification-tag =    token
       </references>
       <references>
         <name>Informative References</name>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.2046.xml"/>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4267.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.2046.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4267.xml"/>
         <!--SCTP-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4960.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4960.xml"/>
         <!--SPEECHSC Requirements-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4313.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4313.xml"/>
         <reference anchor="Q.23">
           <front>
             <title>Technical Features of Push-Button Telephone Sets</title>
@@ -10387,10 +10387,10 @@ identification-tag =    token
         </reference>
         <!--Registration Procedures for URL Scheme Names-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4395.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4395.xml"/>
         <!--DTMF in RTP-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4733.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4733.xml"/>
         <!-- VoiceXML 2.0 -->
 
       <reference anchor="W3C.REC-voicexml20-20040316" target="https://www.w3.org/TR/2004/REC-voicexml20-20040316" xml:base="https://xml2rfc.tools.ietf.org/public/rfc/bibxml4/reference.W3C.REC-voicexml20-20040316.xml">
@@ -10432,7 +10432,7 @@ identification-tag =    token
         </reference>
         <!--MRCP V1-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4463.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4463.xml"/>
         <reference anchor="refs.javaSpeechGrammarFormat" target="http://java.sun.com/products/java-media/speech/forDevelopers/JSGF/">
           <front>
             <title>Java Speech Grammar Format Version 1.0</title>
@@ -10473,7 +10473,7 @@ identification-tag =    token
         </reference>
         <!--URLAUTH IMAP extension-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4467.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4467.xml"/>
         <reference anchor="W3C.REC-pronunciation-lexicon-20081014" target="http://www.w3.org/TR/2008/REC-pronunciation-lexicon-20081014">
           <front>
             <title>Pronunciation Lexicon Specification (PLS)</title>
@@ -10498,7 +10498,7 @@ identification-tag =    token
         </reference>
         <!--HTTPS-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.2818.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.2818.xml"/>
         <!--ISO 8601-->
 
       <reference anchor="ISO.8601.1988" xml:base="https://xml2rfc.tools.ietf.org/public/rfc/bibxml2/reference.ISO.8601.1988.xml">
@@ -10513,13 +10513,13 @@ identification-tag =    token
         </reference>
         <!--IPsec-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4301.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4301.xml"/>
         <!--FTPS-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4217.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4217.xml"/>
         <!--Web Origin-->
 
-      <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.6454.xml"/>
+      <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.6454.xml"/>
       </references>
     </references>
     <section numbered="true" toc="default">
diff --git a/tests/valid/rfc6787.v3add-xinclude.xml b/tests/valid/rfc6787.v3add-xinclude.xml
index 97eede192..0bf3ddb39 100644
--- a/tests/valid/rfc6787.v3add-xinclude.xml
+++ b/tests/valid/rfc6787.v3add-xinclude.xml
@@ -867,13 +867,13 @@ draft-gieben-writing-rfcs-pandoc-00.txt -> draft.txt
       </references>
       <references>
         <name>Normative References</name>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4641.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4641.xml"/>
       </references>
       <references>
         <name>Informative References (by reference)</name>
         <!-- bibxml reference -->
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4941.xml"/><!-- bibxml-misc reference -->
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4941.xml"/><!-- bibxml-misc reference -->
         <reference anchor="ISO.8327.1990" xml:base="https://xml2rfc.tools.ietf.org/public/rfc/bibxml-misc/reference.ISO.8327.1990.xml">
 <front>
 <title>Information processing systems - Open Systems Interconnection - Basic connection oriented session protocol specification</title>
diff --git a/tests/valid/rfc7911.v2v3.xml b/tests/valid/rfc7911.v2v3.xml
index 977dfee0a..e9bc1dc42 100644
--- a/tests/valid/rfc7911.v2v3.xml
+++ b/tests/valid/rfc7911.v2v3.xml
@@ -11,7 +11,7 @@
 <?rfc compact="yes"?>
 <?rfc subcompact="no"?>
 <rfc xmlns:xi="http://www.w3.org/2001/XInclude" number="7911" category="std" consensus="true" submissionType="IETF" ipr="trust200902" docName="draft-ietf-idr-add-paths" obsoletes="" updates="" xml:lang="en" tocInclude="true" sortRefs="true" symRefs="true" version="3">
-  <!-- xml2rfc v2v3 conversion 3.7.0 -->
+  <!-- xml2rfc v2v3 conversion 3.12.10 -->
   <link href="https://datatracker.ietf.org/doc/draft-ietf-idr-add-paths" rel="prev"/>
   <?v3xml2rfc silence="The 'docName' attribute of the .rfc/. element should have a revision number" ?>
   <?v3xml2rfc silence="The document date .*? is more than 3 days away from today's date" ?>
@@ -276,14 +276,14 @@
       <name>References</name>
       <references>
         <name>Normative References</name>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4271.xml"/>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.5492.xml"/>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4760.xml"/>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4271.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.5492.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4760.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
       </references>
       <references>
         <name>Informative References</name>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.3345.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.3345.xml"/>
         <!--draft-ietf-idr-route-oscillation-stop IESG State: IESG Evaluation::Revised
 I-D Needed -->
 
@@ -354,8 +354,8 @@ I-D Needed -->
           </front>
           <seriesInfo name="Work in Progress," value="draft-pmohapat-idr-fast-conn-restore-03"/>
         </reference>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4724.xml"/>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4272.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4724.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4272.xml"/>
       </references>
     </references>
     <section numbered="false" toc="default">
diff --git a/tests/valid/rfc7911.v3add-xinclude.xml b/tests/valid/rfc7911.v3add-xinclude.xml
index 97eede192..0bf3ddb39 100644
--- a/tests/valid/rfc7911.v3add-xinclude.xml
+++ b/tests/valid/rfc7911.v3add-xinclude.xml
@@ -867,13 +867,13 @@ draft-gieben-writing-rfcs-pandoc-00.txt -> draft.txt
       </references>
       <references>
         <name>Normative References</name>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4641.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.2119.xml"/>
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4641.xml"/>
       </references>
       <references>
         <name>Informative References (by reference)</name>
         <!-- bibxml reference -->
-        <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.4941.xml"/><!-- bibxml-misc reference -->
+        <xi:include href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.4941.xml"/><!-- bibxml-misc reference -->
         <reference anchor="ISO.8327.1990" xml:base="https://xml2rfc.tools.ietf.org/public/rfc/bibxml-misc/reference.ISO.8327.1990.xml">
 <front>
 <title>Information processing systems - Open Systems Interconnection - Basic connection oriented session protocol specification</title>
diff --git a/tests/valid/sourcecode.pages.text b/tests/valid/sourcecode.pages.text
index 8413903a6..8b2e50ac3 100644
--- a/tests/valid/sourcecode.pages.text
+++ b/tests/valid/sourcecode.pages.text
@@ -3,9 +3,9 @@
 
 
 Network Working Group                                     H. Person, Ed.
-Internet-Draft                                             June 16, 2022
+Internet-Draft                                             June 20, 2022
 Intended status: Experimental                                           
-Expires: December 18, 2022
+Expires: December 22, 2022
 
 
                         xml2rfc sourcecode tests
@@ -26,7 +26,7 @@ Status of This Memo
    time.  It is inappropriate to use Internet-Drafts as reference
    material or to cite them other than as "work in progress."
 
-   This Internet-Draft will expire on December 18, 2022.
+   This Internet-Draft will expire on December 22, 2022.
 
 Copyright Notice
 
@@ -53,7 +53,7 @@ Table of Contents
 
 
 
-Person                  Expires December 18, 2022               [Page 1]
+Person                  Expires December 22, 2022               [Page 1]
 
 Internet-Draft          xml2rfc sourcecode tests               June 2022
 
@@ -109,7 +109,7 @@ Internet-Draft          xml2rfc sourcecode tests               June 2022
 
 
 
-Person                  Expires December 18, 2022               [Page 2]
+Person                  Expires December 22, 2022               [Page 2]
 
 Internet-Draft          xml2rfc sourcecode tests               June 2022
 
@@ -165,7 +165,7 @@ Internet-Draft          xml2rfc sourcecode tests               June 2022
 
 
 
-Person                  Expires December 18, 2022               [Page 3]
+Person                  Expires December 22, 2022               [Page 3]
 
 Internet-Draft          xml2rfc sourcecode tests               June 2022
 
@@ -221,4 +221,4 @@ Author's Address
 
 
 
-Person                  Expires December 18, 2022               [Page 4]
+Person                  Expires December 22, 2022               [Page 4]
diff --git a/tests/valid/sourcecode.prepped.xml b/tests/valid/sourcecode.prepped.xml
index 3bd622486..9d749db0f 100644
--- a/tests/valid/sourcecode.prepped.xml
+++ b/tests/valid/sourcecode.prepped.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" category="exp" docName="sourcecode-00" indexInclude="true" ipr="trust200902" prepTime="2022-06-16T04:34:14" scripts="Common,Latin" sortRefs="true" submissionType="independent" symRefs="true" tocDepth="3" tocInclude="true">
+<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" category="exp" docName="sourcecode-00" indexInclude="true" ipr="trust200902" prepTime="2022-06-20T23:09:15" scripts="Common,Latin" sortRefs="true" submissionType="independent" symRefs="true" tocDepth="3" tocInclude="true">
   <!-- xml2rfc v2v3 conversion 3.12.10 -->
   
     
@@ -20,7 +20,7 @@
         </postal>
       </address>
     </author>
-    <date day="16" month="06" year="2022"/>
+    <date day="20" month="06" year="2022"/>
     <boilerplate>
       <section anchor="status-of-memo" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.1">
         <name slugifiedName="name-status-of-this-memo">Status of This Memo</name>
@@ -41,7 +41,7 @@
         material or to cite them other than as "work in progress."
         </t>
         <t indent="0" pn="section-boilerplate.1-4">
-        This Internet-Draft will expire on 18 December 2022.
+        This Internet-Draft will expire on 22 December 2022.
         </t>
       </section>
       <section anchor="copyright" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.2">
diff --git a/tests/valid/sourcecode.text b/tests/valid/sourcecode.text
index 67319bbcf..d6b6ad081 100644
--- a/tests/valid/sourcecode.text
+++ b/tests/valid/sourcecode.text
@@ -3,9 +3,9 @@
 
 
 Network Working Group                                     H. Person, Ed.
-Internet-Draft                                             June 16, 2022
+Internet-Draft                                             June 20, 2022
 Intended status: Experimental                                           
-Expires: December 18, 2022
+Expires: December 22, 2022
 
 
                         xml2rfc sourcecode tests
@@ -26,7 +26,7 @@ Status of This Memo
    time.  It is inappropriate to use Internet-Drafts as reference
    material or to cite them other than as "work in progress."
 
-   This Internet-Draft will expire on December 18, 2022.
+   This Internet-Draft will expire on December 22, 2022.
 
 Copyright Notice
 
diff --git a/tests/valid/sourcecode.v3.html b/tests/valid/sourcecode.v3.html
index 86bb9f5e2..6bfc61b7c 100644
--- a/tests/valid/sourcecode.v3.html
+++ b/tests/valid/sourcecode.v3.html
@@ -23,7 +23,7 @@
 </tr></thead>
 <tfoot><tr>
 <td class="left">Person</td>
-<td class="center">Expires December 18, 2022</td>
+<td class="center">Expires December 22, 2022</td>
 <td class="right">[Page]</td>
 </tr></tfoot>
 </table>
@@ -36,12 +36,12 @@
 <dd class="internet-draft">sourcecode-00</dd>
 <dt class="label-published">Published:</dt>
 <dd class="published">
-<time datetime="2022-06-16" class="published">June 16, 2022</time>
+<time datetime="2022-06-20" class="published">June 20, 2022</time>
     </dd>
 <dt class="label-intended-status">Intended Status:</dt>
 <dd class="intended-status">Experimental</dd>
 <dt class="label-expires">Expires:</dt>
-<dd class="expires"><time datetime="2022-12-18">December 18, 2022</time></dd>
+<dd class="expires"><time datetime="2022-12-22">December 22, 2022</time></dd>
 <dt class="label-authors">Author:</dt>
 <dd class="authors">
 <div class="author">
@@ -71,7 +71,7 @@ <h2 id="name-status-of-this-memo">
         time. It is inappropriate to use Internet-Drafts as reference
         material or to cite them other than as "work in progress."<a href="#section-boilerplate.1-3" class="pilcrow">¶</a></p>
 <p id="section-boilerplate.1-4">
-        This Internet-Draft will expire on December 18, 2022.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
+        This Internet-Draft will expire on December 22, 2022.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
 </section>
 </div>
 <div id="copyright">
diff --git a/xml2rfc/parser.py b/xml2rfc/parser.py
index fa79ce4fe..6c873f9ad 100644
--- a/xml2rfc/parser.py
+++ b/xml2rfc/parser.py
@@ -54,8 +54,10 @@ class CachingResolver(lxml.etree.Resolver):
     def __init__(self, cache_path=None, library_dirs=None, source=None,
                  templates_path=base.default_options.template_dir, verbose=None, quiet=None,
                  no_network=None, network_locs= [
+                     'https://bib.ietf.org/public/rfc/',
                      'https://xml2rfc.ietf.org/public/rfc/',
                      'https://xml2rfc.tools.ietf.org/public/rfc/',
+                     'http://bib.ietf.org/public/rfc/',
                      'http://xml2rfc.ietf.org/public/rfc/',
                      'http://xml2rfc.tools.ietf.org/public/rfc/',
                  ],
diff --git a/xml2rfc/writers/v2v3.py b/xml2rfc/writers/v2v3.py
index 44f6f122d..147433b2c 100644
--- a/xml2rfc/writers/v2v3.py
+++ b/xml2rfc/writers/v2v3.py
@@ -64,7 +64,7 @@ def add_xinclude(self):
                         xi = self.element('{http://www.w3.org/2001/XInclude}include',
                                     nsmap=self.xmlrfc.nsmap,
                                     line=e.sourceline,
-                                    href="https://xml2rfc.ietf.org/public/rfc/bibxml/reference.RFC.%04d.xml"%int(num))
+                                    href="https://bib.ietf.org/public/rfc/bibxml/reference.RFC.%04d.xml"%int(num))
                         xi.tail = e.tail
                         i = p.index(e)
                         p.remove(e)