diff --git a/tests/valid/docfile.html b/tests/valid/docfile.html
index 93565e6f..4a6b35ec 100644
--- a/tests/valid/docfile.html
+++ b/tests/valid/docfile.html
@@ -4,15 +4,15 @@
 <meta charset="utf-8">
 <meta content="Cherokee,Common,Greek,Latin" name="scripts">
 <meta content="initial-scale=1.0" name="viewport">
-<title>Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.30.2</title>
+<title>Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.31.0</title>
 <meta content="xml2rfc(1)" name="author">
 <meta content="
        
        This document provides information about the XML schema implemented in this release of xml2rfc, and the individual elements of that schema.  The document is generated from the RNG schema file that is part of the xml2rfc distribution, so schema information in this document should always be in sync with the schema in actual use.  The textual descriptions depend on manual updates in order to reflect the implementation.
        
     " name="description">
-<meta content="xml2rfc 3.30.2" name="generator">
-<meta content="xml2rfc-docs-3.30.2" name="ietf.draft">
+<meta content="xml2rfc 3.31.0" name="generator">
+<meta content="xml2rfc-docs-3.31.0" name="ietf.draft">
 <link href="docfile.xml" rel="alternate" type="application/rfc+xml">
 <link href="#copyright" rel="license">
 <link href="xml2rfc.css" rel="stylesheet">
@@ -24,7 +24,7 @@
 <thead><tr>
 <td class="left"></td>
 <td class="center">Xml2rfc Vocabulary V3 Schema</td>
-<td class="right">September 2025</td>
+<td class="right">October 2025</td>
 </tr></thead>
 <tfoot><tr>
 <td class="left">xml2rfc(1)</td>
@@ -39,7 +39,7 @@
 <dd class="workgroup">xml2rfc(1)</dd>
 <dt class="label-published">Published:</dt>
 <dd class="published">
-<time datetime="2025-09-24" class="published">24 September 2025</time>
+<time datetime="2025-10-14" class="published">14 October 2025</time>
     </dd>
 <dt class="label-authors">Author:</dt>
 <dd class="authors">
@@ -49,7 +49,7 @@
 </dd>
 </dl>
 </div>
-<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.30.2</h1>
+<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.31.0</h1>
 <section id="section-abstract">
       <h2 id="abstract"><a href="#abstract" class="selfRef">Abstract</a></h2>
 <p id="section-abstract-1">
@@ -371,7 +371,7 @@ <h2 id="name-introduction">
 <p id="section-1-5">
        The RFCXML vocabulary reference is available at <span><a href="https://authors.ietf.org/en/rfcxml-vocabulary">https://authors.ietf.org/en/rfcxml-vocabulary</a></span>.<a href="#section-1-5" class="pilcrow">¶</a></p>
 <p id="section-1-6">
-            This documentation applies to xml2rfc version 3.30.2.<a href="#section-1-6" class="pilcrow">¶</a></p>
+            This documentation applies to xml2rfc version 3.31.0.<a href="#section-1-6" class="pilcrow">¶</a></p>
 </section>
 <section id="section-2">
       <h2 id="name-schema-version-3-elements">
@@ -6397,7 +6397,7 @@ <h2 id="name-xml2rfc-documentation-templ">
 <p id="appendix-D-1">
 
             The following variables are available for use in an xml2rfc
-            manpage Jinja2 template, as of xml2rfc version 3.30.2:<a href="#appendix-D-1" class="pilcrow">¶</a></p>
+            manpage Jinja2 template, as of xml2rfc version 3.31.0:<a href="#appendix-D-1" class="pilcrow">¶</a></p>
 <span class="break"></span><dl class="dlNewline" id="appendix-D-2">
         <dt id="appendix-D-2.1">{{ bare_latin_tags }}:</dt>
         <dd style="margin-left: 1.5em" id="appendix-D-2.2"></dd>
diff --git a/tests/valid/draft-miek-test.html b/tests/valid/draft-miek-test.html
index 4392361a..3a2e91da 100644
--- a/tests/valid/draft-miek-test.html
+++ b/tests/valid/draft-miek-test.html
@@ -16,7 +16,7 @@
             This version is adapted to work with "xml2rfc" version 2.x.  
        
     ' name="description">
-<meta content="xml2rfc 3.30.2" name="generator">
+<meta content="xml2rfc 3.31.0" name="generator">
 <meta content="RFC" name="keyword">
 <meta content="Request for Comments" name="keyword">
 <meta content="I-D" name="keyword">
@@ -26,20 +26,19 @@
 <meta content="Extensible Markup Language" name="keyword">
 <meta content="draft-gieben-writing-rfcs-pandoc-02" name="ietf.draft">
 <!-- Generator version information:
-  xml2rfc 3.30.2
+  xml2rfc 3.31.0
     Python 3.13.5
     ConfigArgParse 1.7.1
     google-i18n-address 3.1.1
     intervaltree 3.1.0
     Jinja2 3.1.6
-    lxml 5.4.0
-    platformdirs 4.3.8
+    lxml 6.0.2
+    platformdirs 4.5.0
     pycountry 24.6.1
-    pypdf 5.6.1
-    PyYAML 6.0.2
-    requests 2.32.4
-    setuptools 80.9.0
-    wcwidth 0.2.13
+    pypdf 6.1.1
+    PyYAML 6.0.3
+    requests 2.32.5
+    wcwidth 0.2.14
     weasyprint 65.0
 -->
 <link href="draft-miek-test.xml" rel="alternate" type="application/rfc+xml">
diff --git a/tests/valid/draft-template.html b/tests/valid/draft-template.html
index b8397241..a05d788f 100644
--- a/tests/valid/draft-template.html
+++ b/tests/valid/draft-template.html
@@ -11,24 +11,23 @@
        Insert an abstract: MANDATORY. This template is for creating an
       Internet Draft. 
     " name="description">
-<meta content="xml2rfc 3.30.2" name="generator">
+<meta content="xml2rfc 3.31.0" name="generator">
 <meta content="template" name="keyword">
 <meta content="draft-ietf-xml2rfc-template-05" name="ietf.draft">
 <!-- Generator version information:
-  xml2rfc 3.30.2
+  xml2rfc 3.31.0
     Python 3.13.5
     ConfigArgParse 1.7.1
     google-i18n-address 3.1.1
     intervaltree 3.1.0
     Jinja2 3.1.6
-    lxml 5.4.0
-    platformdirs 4.3.8
+    lxml 6.0.2
+    platformdirs 4.5.0
     pycountry 24.6.1
-    pypdf 5.6.1
-    PyYAML 6.0.2
-    requests 2.32.4
-    setuptools 80.9.0
-    wcwidth 0.2.13
+    pypdf 6.1.1
+    PyYAML 6.0.3
+    requests 2.32.5
+    wcwidth 0.2.14
     weasyprint 65.0
 -->
 <link href="draft-template.xml" rel="alternate" type="application/rfc+xml">
diff --git a/tests/valid/indexes.pages.text b/tests/valid/indexes.pages.text
index c1b0e8f7..0b8f0534 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                                        September 25, 2025
+Internet-Draft                                          October 14, 2025
 Intended status: Experimental                                           
-Expires: March 29, 2026
+Expires: April 17, 2026
 
 
                           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 March 29, 2026.
+   This Internet-Draft will expire on April 17, 2026.
 
 Copyright Notice
 
@@ -53,9 +53,9 @@ Table of Contents
 
 
 
-Person                   Expires March 29, 2026                 [Page 1]
+Person                   Expires April 17, 2026                 [Page 1]
 
-Internet-Draft             xml2rfc index tests            September 2025
+Internet-Draft             xml2rfc index tests              October 2025
 
 
    This is another section!
@@ -109,9 +109,9 @@ Index
 
 
 
-Person                   Expires March 29, 2026                 [Page 2]
+Person                   Expires April 17, 2026                 [Page 2]
 
-Internet-Draft             xml2rfc index tests            September 2025
+Internet-Draft             xml2rfc index tests              October 2025
 
 
       E
@@ -165,4 +165,4 @@ Author's Address
 
 
 
-Person                   Expires March 29, 2026                 [Page 3]
+Person                   Expires April 17, 2026                 [Page 3]
diff --git a/tests/valid/indexes.prepped.xml b/tests/valid/indexes.prepped.xml
index 58d22537..844b0900 100644
--- a/tests/valid/indexes.prepped.xml
+++ b/tests/valid/indexes.prepped.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="indexes-00" indexInclude="true" prepTime="2025-09-25T20:52:21" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
-  <!-- xml2rfc v2v3 conversion 3.30.2 -->
+<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="indexes-00" indexInclude="true" prepTime="2025-10-14T01:44:00" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
+  <!-- xml2rfc v2v3 conversion 3.31.0 -->
   
     
     
@@ -20,7 +20,7 @@
         </postal>
       </address>
     </author>
-    <date day="25" month="09" year="2025"/>
+    <date day="14" month="10" year="2025"/>
     <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 29 March 2026.
+        This Internet-Draft will expire on 17 April 2026.
         </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 5cf34f1e..8bc38e6d 100644
--- a/tests/valid/indexes.text
+++ b/tests/valid/indexes.text
@@ -3,9 +3,9 @@
 
 
 Network Working Group                                     H. Person, Ed.
-Internet-Draft                                        September 25, 2025
+Internet-Draft                                          October 14, 2025
 Intended status: Experimental                                           
-Expires: March 29, 2026
+Expires: April 17, 2026
 
 
                           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 March 29, 2026.
+   This Internet-Draft will expire on April 17, 2026.
 
 Copyright Notice
 
diff --git a/tests/valid/indexes.v3.html b/tests/valid/indexes.v3.html
index ba8ebe12..02337171 100644
--- a/tests/valid/indexes.v3.html
+++ b/tests/valid/indexes.v3.html
@@ -6,7 +6,7 @@
 <meta content="initial-scale=1.0" name="viewport">
 <title>xml2rfc index tests</title>
 <meta content="Human Person" name="author">
-<meta content="xml2rfc 3.30.2" name="generator">
+<meta content="xml2rfc 3.31.0" name="generator">
 <meta content="indexes-00" name="ietf.draft">
 <link href="indexes.xml" rel="alternate" type="application/rfc+xml">
 <link href="#copyright" rel="license">
@@ -19,11 +19,11 @@
 <thead><tr>
 <td class="left">Internet-Draft</td>
 <td class="center">xml2rfc index tests</td>
-<td class="right">September 2025</td>
+<td class="right">October 2025</td>
 </tr></thead>
 <tfoot><tr>
 <td class="left">Person</td>
-<td class="center">Expires March 29, 2026</td>
+<td class="center">Expires April 17, 2026</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="2025-09-25" class="published">September 25, 2025</time>
+<time datetime="2025-10-14" class="published">October 14, 2025</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="2026-03-29">March 29, 2026</time></dd>
+<dd class="expires"><time datetime="2026-04-17">April 17, 2026</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 March 29, 2026.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
+        This Internet-Draft will expire on April 17, 2026.<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 0e1e682c..dfe14e8f 100644
--- a/tests/valid/manpage.txt
+++ b/tests/valid/manpage.txt
@@ -1,10 +1,10 @@
 xml2rfc(1)                                                    xml2rfc(1)
-                                                       25 September 2025
+                                                         14 October 2025
 
 
                   Xml2rfc Vocabulary Version 3 Schema
-                         xml2rfc release 3.30.2
-                          xml2rfc-docs-3.30.2
+                         xml2rfc release 3.31.0
+                          xml2rfc-docs-3.31.0
 
 Abstract
 
@@ -54,7 +54,7 @@ Table of Contents
    The RFCXML vocabulary reference is available at
    https://authors.ietf.org/en/rfcxml-vocabulary.
 
-   This documentation applies to xml2rfc version 3.30.2.
+   This documentation applies to xml2rfc version 3.31.0.
 
 2.  Schema Version 3 Elements
 
@@ -4342,7 +4342,7 @@ Appendix C.  xml2rfc Configuration Files
 Appendix D.  xml2rfc Documentation Template Variables
 
    The following variables are available for use in an xml2rfc manpage
-   Jinja2 template, as of xml2rfc version 3.30.2:
+   Jinja2 template, as of xml2rfc version 3.31.0:
 
    {{ bare_latin_tags }}:
 
diff --git a/tests/valid/rfc7911.html b/tests/valid/rfc7911.html
index 33ffc4c0..9f3f61a7 100644
--- a/tests/valid/rfc7911.html
+++ b/tests/valid/rfc7911.html
@@ -16,23 +16,22 @@
       that each path is identified by a Path Identifier in addition to the
       address prefix. 
     " name="description">
-<meta content="xml2rfc 3.30.2" name="generator">
+<meta content="xml2rfc 3.31.0" name="generator">
 <meta content="7911" name="rfc.number">
 <!-- Generator version information:
-  xml2rfc 3.30.2
+  xml2rfc 3.31.0
     Python 3.13.5
     ConfigArgParse 1.7.1
     google-i18n-address 3.1.1
     intervaltree 3.1.0
     Jinja2 3.1.6
-    lxml 5.4.0
-    platformdirs 4.3.8
+    lxml 6.0.2
+    platformdirs 4.5.0
     pycountry 24.6.1
-    pypdf 5.6.1
-    PyYAML 6.0.2
-    requests 2.32.4
-    setuptools 80.9.0
-    wcwidth 0.2.13
+    pypdf 6.1.1
+    PyYAML 6.0.3
+    requests 2.32.5
+    wcwidth 0.2.14
     weasyprint 65.0
 -->
 <link href="rfc7911.xml" rel="alternate" type="application/rfc+xml">
diff --git a/tests/valid/rfc99999.html b/tests/valid/rfc99999.html
index 5636e245..ae282386 100644
--- a/tests/valid/rfc99999.html
+++ b/tests/valid/rfc99999.html
@@ -9,23 +9,22 @@
 <meta content="
        This is not a real RFC. 
     " name="description">
-<meta content="xml2rfc 3.30.2" name="generator">
+<meta content="xml2rfc 3.31.0" name="generator">
 <meta content="99999" name="rfc.number">
 <!-- Generator version information:
-  xml2rfc 3.30.2
+  xml2rfc 3.31.0
     Python 3.13.5
     ConfigArgParse 1.7.1
     google-i18n-address 3.1.1
     intervaltree 3.1.0
     Jinja2 3.1.6
-    lxml 5.4.0
-    platformdirs 4.3.8
+    lxml 6.0.2
+    platformdirs 4.5.0
     pycountry 24.6.1
-    pypdf 5.6.1
-    PyYAML 6.0.2
-    requests 2.32.4
-    setuptools 80.9.0
-    wcwidth 0.2.13
+    pypdf 6.1.1
+    PyYAML 6.0.3
+    requests 2.32.5
+    wcwidth 0.2.14
     weasyprint 65.0
 -->
 <link href="rfc99999.xml" rel="alternate" type="application/rfc+xml">
diff --git a/tests/valid/sourcecode.pages.text b/tests/valid/sourcecode.pages.text
index 25b612e3..91a7e6c5 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                                        September 25, 2025
+Internet-Draft                                          October 14, 2025
 Intended status: Experimental                                           
-Expires: March 29, 2026
+Expires: April 17, 2026
 
 
                         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 March 29, 2026.
+   This Internet-Draft will expire on April 17, 2026.
 
 Copyright Notice
 
@@ -53,9 +53,9 @@ Table of Contents
 
 
 
-Person                   Expires March 29, 2026                 [Page 1]
+Person                   Expires April 17, 2026                 [Page 1]
 
-Internet-Draft          xml2rfc sourcecode tests          September 2025
+Internet-Draft          xml2rfc sourcecode tests            October 2025
 
 
    print("01")
@@ -109,9 +109,9 @@ Internet-Draft          xml2rfc sourcecode tests          September 2025
 
 
 
-Person                   Expires March 29, 2026                 [Page 2]
+Person                   Expires April 17, 2026                 [Page 2]
 
-Internet-Draft          xml2rfc sourcecode tests          September 2025
+Internet-Draft          xml2rfc sourcecode tests            October 2025
 
 
    print("49")
@@ -165,9 +165,9 @@ Internet-Draft          xml2rfc sourcecode tests          September 2025
 
 
 
-Person                   Expires March 29, 2026                 [Page 3]
+Person                   Expires April 17, 2026                 [Page 3]
 
-Internet-Draft          xml2rfc sourcecode tests          September 2025
+Internet-Draft          xml2rfc sourcecode tests            October 2025
 
 
    print("47")
@@ -221,4 +221,4 @@ Author's Address
 
 
 
-Person                   Expires March 29, 2026                 [Page 4]
+Person                   Expires April 17, 2026                 [Page 4]
diff --git a/tests/valid/sourcecode.prepped.xml b/tests/valid/sourcecode.prepped.xml
index a5413f76..86c7321d 100644
--- a/tests/valid/sourcecode.prepped.xml
+++ b/tests/valid/sourcecode.prepped.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="sourcecode-00" prepTime="2025-09-25T20:52:31" indexInclude="true" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
-  <!-- xml2rfc v2v3 conversion 3.30.2 -->
+<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="sourcecode-00" prepTime="2025-10-14T01:44:10" indexInclude="true" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
+  <!-- xml2rfc v2v3 conversion 3.31.0 -->
   
     
     
@@ -20,7 +20,7 @@
         </postal>
       </address>
     </author>
-    <date day="25" month="09" year="2025"/>
+    <date day="14" month="10" year="2025"/>
     <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 29 March 2026.
+        This Internet-Draft will expire on 17 April 2026.
         </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 ec519100..6d2e3fda 100644
--- a/tests/valid/sourcecode.text
+++ b/tests/valid/sourcecode.text
@@ -3,9 +3,9 @@
 
 
 Network Working Group                                     H. Person, Ed.
-Internet-Draft                                        September 25, 2025
+Internet-Draft                                          October 14, 2025
 Intended status: Experimental                                           
-Expires: March 29, 2026
+Expires: April 17, 2026
 
 
                         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 March 29, 2026.
+   This Internet-Draft will expire on April 17, 2026.
 
 Copyright Notice
 
diff --git a/tests/valid/sourcecode.v3.html b/tests/valid/sourcecode.v3.html
index 3c925133..6acdb0ea 100644
--- a/tests/valid/sourcecode.v3.html
+++ b/tests/valid/sourcecode.v3.html
@@ -6,7 +6,7 @@
 <meta content="initial-scale=1.0" name="viewport">
 <title>xml2rfc sourcecode tests</title>
 <meta content="Human Person" name="author">
-<meta content="xml2rfc 3.30.2" name="generator">
+<meta content="xml2rfc 3.31.0" name="generator">
 <meta content="sourcecode-00" name="ietf.draft">
 <link href="sourcecode.xml" rel="alternate" type="application/rfc+xml">
 <link href="#copyright" rel="license">
@@ -19,11 +19,11 @@
 <thead><tr>
 <td class="left">Internet-Draft</td>
 <td class="center">xml2rfc sourcecode tests</td>
-<td class="right">September 2025</td>
+<td class="right">October 2025</td>
 </tr></thead>
 <tfoot><tr>
 <td class="left">Person</td>
-<td class="center">Expires March 29, 2026</td>
+<td class="center">Expires April 17, 2026</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="2025-09-25" class="published">September 25, 2025</time>
+<time datetime="2025-10-14" class="published">October 14, 2025</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="2026-03-29">March 29, 2026</time></dd>
+<dd class="expires"><time datetime="2026-04-17">April 17, 2026</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 March 29, 2026.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
+        This Internet-Draft will expire on April 17, 2026.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
 </section>
 </div>
 <div id="copyright">
diff --git a/xml2rfc/writers/text.py b/xml2rfc/writers/text.py
index 59f58010..674cbd43 100644
--- a/xml2rfc/writers/text.py
+++ b/xml2rfc/writers/text.py
@@ -82,7 +82,7 @@ def __init__(self, elem, prev, next=None, beg=None, end=None):
         self.beg  = beg                 # beginning line of block
         self.end  = end                 # ending line of block
 
-wrapper = utils.TextWrapper(width=MAX_WIDTH)
+wrapper = utils.TextWrapper(width=MAX_WIDTH, break_long_words=False)
 splitter = utils.TextSplitter(width=SPLITTER_WIDTH)
 seen = set()