diff --git a/P5/Source/Guidelines/en/BIB-Bibliography.xml b/P5/Source/Guidelines/en/BIB-Bibliography.xml
index 7e56b5c983..f2c17db390 100644
--- a/P5/Source/Guidelines/en/BIB-Bibliography.xml
+++ b/P5/Source/Guidelines/en/BIB-Bibliography.xml
@@ -3607,6 +3607,26 @@
           </imprint>
         </monogr>
       </biblStruct>
+      <biblStruct xml:id="BIB_semVer">
+        <!-- This probably needs to be fleshed out more —Syd, 2024-05-21 -->
+        <monogr>
+          <title>Semantic Versioning 2.0.0</title>
+          <ptr target="https://semver.org/#semantic-versioning-200"/>
+          <imprint>
+            <date when="2023-12-19"/>
+          </imprint>
+        </monogr>
+      </biblStruct>
+      <biblStruct>
+        <!-- This probably needs to be fleshed out more —Syd, 2024-09-02 -->
+        <monogr>
+          <title>Calendar Versioning</title>
+	  <ptr target="https://calver.org/"/>
+	  <imprint>
+	    <date when="2019-07-01"/>
+	  </imprint>
+	</monogr>
+      </biblStruct>	
     </listBibl>
   </div>
   <div xml:id="BIB-RDG">
diff --git a/P5/Source/Guidelines/en/ST-Infrastructure.xml b/P5/Source/Guidelines/en/ST-Infrastructure.xml
index f745f121a9..220d2eb5c0 100644
--- a/P5/Source/Guidelines/en/ST-Infrastructure.xml
+++ b/P5/Source/Guidelines/en/ST-Infrastructure.xml
@@ -1309,7 +1309,10 @@ entities in the XML DTD fragments.--></p>
           <specDesc key="teidata.pointer"/>
           <specDesc key="teidata.authority"/>
           <specDesc key="teidata.version"/>
-          <specDesc key="teidata.versionNumber"/>
+          <specDesc key="teidata.version.semantic"/>
+          <specDesc key="teidata.version.calendar"/>
+          <specDesc key="teidata.version.Unicode"/>
+          <specDesc key="teidata.version.teiP5"/>
           <specDesc key="teidata.replacement"/>
           <specDesc key="teidata.xpath"/>
         </specList>
@@ -1323,7 +1326,10 @@ entities in the XML DTD fragments.--></p>
         <xi:include href="../../Specs/teidata.pointer.xml"/>
         <xi:include href="../../Specs/teidata.authority.xml"/>
         <xi:include href="../../Specs/teidata.version.xml"/>
-        <xi:include href="../../Specs/teidata.versionNumber.xml"/>
+        <xi:include href="../../Specs/teidata.version.semantic.xml"/>
+        <xi:include href="../../Specs/teidata.version.calendar.xml"/>
+        <xi:include href="../../Specs/teidata.version.Unicode.xml"/>
+        <xi:include href="../../Specs/teidata.version.teiP5.xml"/>
         <xi:include href="../../Specs/teidata.replacement.xml"/>
         <xi:include href="../../Specs/teidata.xpath.xml"/>
       </specGrp>
diff --git a/P5/Source/Specs/TEI.xml b/P5/Source/Specs/TEI.xml
index 980132751d..57e259e789 100644
--- a/P5/Source/Specs/TEI.xml
+++ b/P5/Source/Specs/TEI.xml
@@ -53,7 +53,7 @@
       <desc versionDate="2018-07-18" xml:lang="de">gibt die Versionsnummer der TEI-Richtlinien an, gegen die dieses Dokument validiert wird.</desc>
       <desc versionDate="2022-05-02" xml:lang="es">especifica el número de versión de las Directrices TEI frente a las cuales este documento es válido.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">versione dello schema TEI</desc>
-      <datatype><dataRef key="teidata.version"/></datatype>
+      <datatype><dataRef key="teidata.version.teiP5"/></datatype>
       <remarks versionDate="2018-01-24" xml:lang="en">
         <p>Major editions of the Guidelines have long been informally referred to by a name made up
           of the letter P (for Proposal) followed by a digit. The current release is one of the many
diff --git a/P5/Source/Specs/application.xml b/P5/Source/Specs/application.xml
index 40e6405c7b..66f0c24619 100644
--- a/P5/Source/Specs/application.xml
+++ b/P5/Source/Specs/application.xml
@@ -40,7 +40,7 @@
       <desc versionDate="2018-12-28" xml:lang="ja">当該ソフトウェアの版番号を示す。識別子や表示名とは異なる。</desc>
       <desc versionDate="2008-03-30" xml:lang="fr">fournit un numéro de version pour l'application, indépendamment de son identifiant ou du nom affiché.</desc>
       <desc versionDate="2007-11-06" xml:lang="it">indica un numero di versione per l'applicazione, indipendentemente dall'identificatore o dal nome visualizzato</desc>
-      <datatype><dataRef key="teidata.versionNumber"/></datatype>
+      <datatype><dataRef key="teidata.version"/></datatype>
     </attDef>
   </attList>
   <exemplum xml:lang="en">
@@ -54,9 +54,9 @@
       </appInfo>
     </egXML>
     <p>This example shows an appInfo element documenting the fact that version 1.5 of the Image
-      Markup Tool1 application has an interest in two parts of a document which was last saved on
-      June 6 2006. The parts concerned are accessible at the URLs given as target for the two
-        <gi>ptr</gi> elements. </p>
+    Markup Tool1 application has an interest in two parts of a document which was last saved on
+    June 6 2006. The parts concerned are accessible at the URLs given as target for the two
+    <gi>ptr</gi> elements. </p>
   </exemplum>
   <exemplum versionDate="2008-04-06" xml:lang="fr">
     <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="gi-application-egXML-ox" source="#NONE">
diff --git a/P5/Source/Specs/att.gaijiProp.xml b/P5/Source/Specs/att.gaijiProp.xml
index 28deb4693c..eb8e3e559a 100644
--- a/P5/Source/Specs/att.gaijiProp.xml
+++ b/P5/Source/Specs/att.gaijiProp.xml
@@ -56,6 +56,8 @@
         <valItem ident="13.0"/>
         <valItem ident="14.0"/>
         <valItem ident="15.0"/>
+        <valItem ident="15.1.0"/>
+        <valItem ident="16.0"/>
         <valItem ident="unassigned"/>
       </valList>
     </attDef>
diff --git a/P5/Source/Specs/att.styleDef.xml b/P5/Source/Specs/att.styleDef.xml
index 0f0e6e0828..7cedec60af 100644
--- a/P5/Source/Specs/att.styleDef.xml
+++ b/P5/Source/Specs/att.styleDef.xml
@@ -2,18 +2,15 @@
 <!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
 <?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
 <classSpec xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="tei" type="atts" ident="att.styleDef">
-  <desc versionDate="2015-02-15" xml:lang="en">provides attributes to specify the name of a formal definition
-  language used to provide formatting or rendition information.</desc>
+  <desc versionDate="2015-02-15" xml:lang="en">provides attributes to specify the name of a formal definition language used to provide formatting or rendition information.</desc>
   <attList>
     <attDef ident="scheme">
       <desc versionDate="2012-10-06" xml:lang="en">identifies the language used to describe the rendition.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">모양을 기술하는 언어를 식별한다.</desc>
-      <desc versionDate="2008-04-06" xml:lang="es">identifica el lenguaje usado para describir la
-        interpretación.</desc>
+      <desc versionDate="2008-04-06" xml:lang="es">identifica el lenguaje usado para describir la interpretación.</desc>
       <desc versionDate="2008-04-05" xml:lang="ja">当該描出を解説する言語を特定する。</desc>
       <desc versionDate="2008-03-30" xml:lang="fr">identifie la langue employée pour décrire le rendu.</desc>
-      <desc versionDate="2007-11-06" xml:lang="it">identifica la lingua utilizzata per descrivere la
-        resa</desc>
+      <desc versionDate="2007-11-06" xml:lang="it">identifica la lingua utilizzata per descrivere la resa</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
       <valList type="closed">
         <valItem ident="css">
@@ -27,11 +24,9 @@
         <valItem ident="xslfo">
           <desc versionDate="2012-10-06" xml:lang="en">Extensible Stylesheet Language Formatting Objects</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">확장가능 스타일시트 언어</desc>
-          <desc versionDate="2008-04-06" xml:lang="es">Objetos extensibles del formato del lenguaje de
-            Stylesheet</desc>
+          <desc versionDate="2008-04-06" xml:lang="es">Objetos extensibles del formato del lenguaje de Stylesheet</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">XSL-FO</desc>
-          <desc versionDate="2008-03-30" xml:lang="fr">langage XSL (Extensible Stylesheet )Formatting
-            Objects</desc>
+          <desc versionDate="2008-03-30" xml:lang="fr">langage XSL (Extensible Stylesheet )Formatting Objects</desc>
           <desc versionDate="2007-11-06" xml:lang="it">linguaggio XSL-FO</desc>
         </valItem>
         <valItem ident="free">
@@ -45,23 +40,25 @@
         <valItem ident="other">
           <desc versionDate="2012-10-06" xml:lang="en">A user-defined rendition description language</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">사용자 정의 해석 기술 언어</desc>
-          <desc versionDate="2008-04-06" xml:lang="es">Un idioma descriptivo de interpretación definido
-            por el usario.</desc>
+          <desc versionDate="2008-04-06" xml:lang="es">Un idioma descriptivo de interpretación definido por el usario.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">利用者が決めた、描出記述言語。</desc>
-          <desc versionDate="2008-03-30" xml:lang="fr">langue de description de l'interprétation définie
-            par l'utilisateur</desc>
-          <desc versionDate="2007-11-06" xml:lang="it">linguaggio di descrizione della resa definito
-            dall'utente</desc>
+          <desc versionDate="2008-03-30" xml:lang="fr">langue de description de l'interprétation définie par l'utilisateur</desc>
+          <desc versionDate="2007-11-06" xml:lang="it">linguaggio di descrizione della resa definito dall'utente</desc>
         </valItem>
       </valList>
       <remarks versionDate="2013-04-11" xml:lang="en">
-        <p>
-If no value for the @scheme attribute is provided, then the default assumption should be that CSS is in use.  </p>
+        <p>If no value for the @scheme attribute is provided, then the default assumption should be that CSS is in use.</p>
       </remarks>
     </attDef>
     <attDef ident="schemeVersion" usage="opt">
       <desc versionDate="2013-04-12" xml:lang="en">supplies a version number for the style language provided in <att>scheme</att>.</desc>
-      <datatype><dataRef key="teidata.versionNumber"/></datatype>
+      <datatype><dataRef key="teidata.version.Unicode"/></datatype>
+      <!--
+          All version numbers of XSLFO (1.0, & 1.1) and of CSS (1, 2,
+          2.1, & 3) are expressible using teidata.version.Unicode. If
+          other possible values are added to @scheme, the datatype
+          used here may need to be revised. —Syd, 2025-01-13
+      -->
       <constraintSpec ident="schemeVersionRequiresScheme" scheme="schematron" xml:lang="en">
         <constraint>
           <sch:rule context="tei:*[@schemeVersion]">
@@ -72,8 +69,9 @@ If no value for the @scheme attribute is provided, then the default assumption s
         </constraint>
       </constraintSpec>
       <remarks versionDate="2013-04-12" xml:lang="en">
-        <p>If <att>schemeVersion</att> is used, then <att>scheme</att> should also appear, with a value
-      other than <val>free</val>.</p>
+        <p>If <att>schemeVersion</att> is used, then <att>scheme</att>
+        should also appear, with a value other than
+        <val>free</val>.</p>
       </remarks>
     </attDef>
   </attList>
diff --git a/P5/Source/Specs/teiCorpus.xml b/P5/Source/Specs/teiCorpus.xml
index ce6d88ab08..8997af2023 100644
--- a/P5/Source/Specs/teiCorpus.xml
+++ b/P5/Source/Specs/teiCorpus.xml
@@ -50,7 +50,7 @@
       <desc versionDate="2007-05-04" xml:lang="es">La versión del esquema TEI</desc>
       <desc versionDate="2007-01-21" xml:lang="it">La versione dello schema TEI</desc>
       <desc versionDate="2017-06-13" xml:lang="de">gibt die Versionsnummer der TEI-Richtlinien an, gegen die dieses Dokument validiert wird.</desc>
-      <datatype><dataRef key="teidata.version"/></datatype>
+      <datatype><dataRef key="teidata.version.teiP5"/></datatype>
       <remarks versionDate="2018-01-24" xml:lang="en">
         <p>Major editions of the Guidelines have long been informally referred to by a name made up
           of the letter P (for Proposal) followed by a digit. The current release is one of the many
diff --git a/P5/Source/Specs/teidata.duration.iso.xml b/P5/Source/Specs/teidata.duration.iso.xml
index a393745d92..552430677b 100644
--- a/P5/Source/Specs/teidata.duration.iso.xml
+++ b/P5/Source/Specs/teidata.duration.iso.xml
@@ -2,83 +2,81 @@
 <!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
 <?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
 <dataSpec xmlns="http://www.tei-c.org/ns/1.0" module="tei" xml:id="data-duration.iso" ident="teidata.duration.iso">
-  <desc versionDate="2007-04-09" xml:lang="en">defines the range of attribute values available for representation of a duration in time
-    using ISO 8601 standard formats.</desc>
+  <desc versionDate="2007-04-09" xml:lang="en">defines the range of attribute values available for representation of a duration in time using ISO 8601 standard formats.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">ISO 8601 표준 형식을 사용하여 시간의 지속을 나타내는 속성 값 범위를 정의한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">以ISO 8601標準格式定義表示一段持續性時間的屬性值範圍</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">ISO 8601にある標準形式を使い、時間幅を表現する当該属性値の範囲を定義 する。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">définit la gamme de valeurs d'attributs exprimant une durée temporaraire utilisant le norme ISO 8601.</desc>
-  <desc versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos posibles para
-    representar la duración en el tiempo usando formatos estàndards ISO 8601.</desc>
+  <desc versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos posibles para representar la duración en el tiempo usando formatos estàndards ISO 8601.</desc>
   <content>
-      <dataRef name="token" restriction="[0-9.,DHMPRSTWYZ/:+\-]+"/>
-   </content>
+    <dataRef name="token" restriction="[0-9.,DHMPRSTWYZ/:+\-]+"/>
+  </content>
   <exemplum xml:lang="en">
-      <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="data-duration.iso-egXML-rh">
-         <time dur-iso="PT0,75H">three-quarters of an hour</time>
-      </egXML>
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="data-duration.iso-egXML-rh">
+      <time dur-iso="PT0,75H">three-quarters of an hour</time>
+    </egXML>
   </exemplum>
   <exemplum xml:lang="en">
-      <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="data-duration.iso-egXML-fc">
-         <date dur-iso="P1,5D">a day and a half</date>
-      </egXML>
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="data-duration.iso-egXML-fc">
+      <date dur-iso="P1,5D">a day and a half</date>
+    </egXML>
   </exemplum>
   <exemplum xml:lang="en">
-      <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="data-duration.iso-egXML-es">
-         <date dur-iso="P14D">a fortnight</date>
-      </egXML>
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="data-duration.iso-egXML-es">
+      <date dur-iso="P14D">a fortnight</date>
+    </egXML>
   </exemplum>
   <exemplum xml:lang="fr">
-      <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="data-duration.iso-egXML-eh">
-         <time dur-iso="PT0,75H">trois quarts d'une heure</time>
-      </egXML>
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="data-duration.iso-egXML-eh">
+      <time dur-iso="PT0,75H">trois quarts d'une heure</time>
+    </egXML>
   </exemplum>
   <exemplum xml:lang="fr">
-      <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="data-duration.iso-egXML-ty">
-         <date dur-iso="P1,5D">une journee et demie</date>
-      </egXML>
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="data-duration.iso-egXML-ty">
+      <date dur-iso="P1,5D">une journee et demie</date>
+    </egXML>
   </exemplum>
   <exemplum xml:lang="fr">
-      <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="data-duration.iso-egXML-jv">
-         <date dur-iso="P14D">une quinzaine</date>
-      </egXML>
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="data-duration.iso-egXML-jv">
+      <date dur-iso="P14D">une quinzaine</date>
+    </egXML>
   </exemplum>
   <exemplum xml:lang="und">
-      <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="data-duration.iso-egXML-ww">
-         <time dur-iso="PT0.02S">20 ms</time>
-      </egXML>
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="data-duration.iso-egXML-ww">
+      <time dur-iso="PT0.02S">20 ms</time>
+    </egXML>
   </exemplum>
   <remarks versionDate="2007-04-20" xml:lang="en">
-      <p>A duration is expressed as a sequence of number-letter pairs, preceded by the letter P; the
-      letter gives the unit and may be Y (year), M (month), D (day), H (hour), M (minute), or S
-      (second), in that order. The numbers are all unsigned integers, except for the last, which may
-      have a decimal component (using either <code>.</code> or <code>,</code> as the decimal point;
-      the latter is preferred). If any number is <mentioned>0</mentioned>, then that number-letter
-      pair may be omitted. If any of the H (hour), M (minute), or S (second) number-letter pairs are
-      present, then the separator <code>T</code> must precede the first <soCalled>time</soCalled>
-      number-letter pair.</p>
-      <p>For complete details, see ISO 8601 <title>Data elements and interchange formats — Information
-        interchange — Representation of dates and times</title>.</p>
+    <p>A duration is expressed as a sequence of number-letter pairs, preceded by the letter P; the
+    letter gives the unit and may be Y (year), M (month), D (day), H (hour), M (minute), or S
+    (second), in that order. The numbers are all unsigned integers, except for the last, which may
+    have a decimal component (using either <code>.</code> or <code>,</code> as the decimal point;
+    the latter is preferred). If any number is <mentioned>0</mentioned>, then that number-letter
+    pair may be omitted. If any of the H (hour), M (minute), or S (second) number-letter pairs are
+    present, then the separator <code>T</code> must precede the first <soCalled>time</soCalled>
+    number-letter pair.</p>
+    <p>For complete details, see ISO 8601 <title>Data elements and interchange formats — Information
+    interchange — Representation of dates and times</title>.</p>
   </remarks>
   <remarks versionDate="2008-04-05" xml:lang="ja">
-      <p> 時間幅は、先頭文字Pに続いて、数値-文字のペア列で示される。 文字は単位を示している。Y(年)、M(月)、D(日)、H(時間)、M(分)、S(秒)
-      の順番になる。数値は符号のない整数である。但し、最後に10進数の 表記記号(小数点を示す<code>.</code>または<code>,</code>。後者が望
-        ましい)をとることはある。数値が<mentioned>0</mentioned>の場合、 数値-文字のペアは省略されることがある。 H(時間)、M(分)、
-      S(秒)が数値-文字のペアを作る場合、区切子 <code>T</code>を先頭にして<soCalled>時間</soCalled>を示す数値-文字 のペアを示す必要がある。 </p>
-      <p> 詳細については、ISO 8601<title>Data elements and interchange formats - Information interchange -
-        Representation of dates and times</title>を参照のこと。 </p>
+    <p> 時間幅は、先頭文字Pに続いて、数値-文字のペア列で示される。 文字は単位を示している。Y(年)、M(月)、D(日)、H(時間)、M(分)、S(秒)
+    の順番になる。数値は符号のない整数である。但し、最後に10進数の 表記記号(小数点を示す<code>.</code>または<code>,</code>。後者が望
+    ましい)をとることはある。数値が<mentioned>0</mentioned>の場合、 数値-文字のペアは省略されることがある。 H(時間)、M(分)、
+    S(秒)が数値-文字のペアを作る場合、区切子 <code>T</code>を先頭にして<soCalled>時間</soCalled>を示す数値-文字 のペアを示す必要がある。 </p>
+    <p> 詳細については、ISO 8601<title>Data elements and interchange formats - Information interchange -
+    Representation of dates and times</title>を参照のこと。 </p>
   </remarks>
   <remarks versionDate="2009-05-25" xml:lang="fr">
-      <p>Une durée est exprimée par une suite de paires alphanumériques, précédée par la lettre P ;
-      la lettre donne l'unité et peut être Y (année), M (mois), D (jour), H (heure), M (minute), ou
-      S (seconde), dans cet ordre. Les nombres sont des entiers sans
-      signe,  à l'exception du dernier,
-      qui peut comporter une décimale (en utilisant soit <code>.</code> soit <code>,</code> pour la
-      virgule ; la dernière possibilité est préférable). Si un nombre est <mentioned>0</mentioned>,
-      alors la paire alphanumérique peut être omise. Si les paires alphanumériques H (heure), M
-      (minute), ou S (seconde) sont présentes, alors le séparateur <code>T</code> doit précéder la
-      première paire alphanumérique <soCalled>time</soCalled>.</p>
-      <p>Pour des détails complets, voir ISO 8601 <title>Data elements and interchange formats —
-        Information interchange — Representation of dates and times</title>.</p>
+    <p>Une durée est exprimée par une suite de paires alphanumériques, précédée par la lettre P ;
+    la lettre donne l'unité et peut être Y (année), M (mois), D (jour), H (heure), M (minute), ou
+    S (seconde), dans cet ordre. Les nombres sont des entiers sans
+    signe,  à l'exception du dernier,
+    qui peut comporter une décimale (en utilisant soit <code>.</code> soit <code>,</code> pour la
+    virgule ; la dernière possibilité est préférable). Si un nombre est <mentioned>0</mentioned>,
+    alors la paire alphanumérique peut être omise. Si les paires alphanumériques H (heure), M
+    (minute), ou S (seconde) sont présentes, alors le séparateur <code>T</code> doit précéder la
+    première paire alphanumérique <soCalled>time</soCalled>.</p>
+    <p>Pour des détails complets, voir ISO 8601 <title>Data elements and interchange formats —
+    Information interchange — Representation of dates and times</title>.</p>
   </remarks>
 </dataSpec>
diff --git a/P5/Source/Specs/teidata.version.Unicode.xml b/P5/Source/Specs/teidata.version.Unicode.xml
new file mode 100644
index 0000000000..d2ea26fc1c
--- /dev/null
+++ b/P5/Source/Specs/teidata.version.Unicode.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
+<?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
+<dataSpec xmlns="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.version.Unicode">
+  <desc versionDate="2024-05-21" xml:lang="en">defines the range of attribute values which may be used to specify a Unicode version number.</desc>
+  <desc xml:lang="fr" versionDate="2007-06-12">définit la gamme des valeurs d'attribut exprimant un numéro de version TEI.</desc>
+  <content>
+    <dataRef name="token" restriction="[\d]+(\.[\d]+){0,2}"/>
+  </content>
+  <remarks versionDate="2012-06-17" xml:lang="en">
+    <p>The value of this attribute follows the pattern specified by
+    the Unicode consortium for its version number (<ptr
+    target="https://unicode.org/versions/"/>). A version number
+    contains digits and fullstop characters only. The first number
+    supplied identifies the major version number. A second and third
+    number, for minor and sub-minor version numbers, may also be
+    supplied.</p>
+  </remarks>
+  <remarks xml:lang="fr" versionDate="2007-06-12">
+    <p>La valeur de cet attribut devrait suivre le format proposé par
+    le Consortium Unicode pour identifier les versions (<ptr
+    target="https://unicode.org/versions/"/>). Un numéro de version ne
+    contient que des chiffres et des points. Le numéro initiale
+    identifie le numéro majeur de la version. Un deuxième et un
+    troisième numéro sont aussi disponibles pour la numérotation
+    facultative des versions mineures ou sous-mineurs.</p>
+  </remarks>
+</dataSpec>
diff --git a/P5/Source/Specs/teidata.version.calendar.xml b/P5/Source/Specs/teidata.version.calendar.xml
new file mode 100644
index 0000000000..a564fac72e
--- /dev/null
+++ b/P5/Source/Specs/teidata.version.calendar.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
+<?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
+<dataSpec xmlns="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.version.calendar">
+  <desc versionDate="2024-05-21" xml:lang="en">defines the range of values which may be used as a calendar-based version number per <ptr target="#BIB_calVer"/>.</desc>
+  <content>
+    <alternate>
+      <!--
+          CalVer components expressed as W3C regular expressions:
+          YYYY = [0-9]{4}
+          YY   = [1-9][0-9][0-9]?[0-9]?
+          0Y   = (: mis defined on specification page? :) (: unused on spec page :)
+          MM   = 1[012]?|2-9
+          0M   = 0[1-9]|1[0-2]
+          WW   = 1-9|[1-4][0-9]|5[0-3] (: unused on spec page :)
+          0W   = 0[1-9]|[2-4][0-9]|5[0-3] (: unused on spec page :)
+          DD   = 1-9|[12][0-9]|3[01]
+          0D   = 0[1-9]|[12][0-9]|3[01]
+      -->
+      <!-- ISO 8601 YYYY, YYYY-MM, YYYY-MM-DD, YYYYY-MM-DDTHH, YYYYY-MM-DDTHH:MM, YYYYY-MM-DDTHH:MM:SS, or YYYYY-MM-DDTHH:MM:SS.FRAC  -->
+      <dataRef name="string" restriction="[0-9]{4}(-[0-9]{2}(-[0-9]{2}(T[0-9]{2}(:[0-9]{2}([0-9]{2}(\.([1-9][0-9]*))?)?)?)?)?)?"/>
+      <!-- Ubuntu = YY.0M.MICRO -->
+      <dataRef name="string" restriction="[1-9][0-9][0-9]?[0-9]?\.(0[1-9]|1[0-2])(\.[1-9][0-9]*)?"/>
+      <!-- Twisted = YY.MM.MICRO -->
+      <dataRef name="string" restriction="[1-9][0-9][0-9]?[0-9]?\.(1[012]?|[2-9])(\.[1-9][0-9]*)?"/>
+      <!-- youtube-dl = YYYY.0M.0D -->
+      <dataRef name="string" restriction="[0-9]{4}\.0[1-9]|1[0-2]\.0[1-9]|[12][0-9]|3[01]"/>
+      <!-- The IANA/Olson timezone database = YYYY[a-z]+ -->
+      <dataRef name="string" restriction="[0-9]{4}[a-z]+"/>
+      <!-- Teradata = YY.MM.MINOR.MICRO -->
+      <dataRef name="string" restriction="[1-9][0-9][0-9]?[0-9]?\.(1[012]?|2-9)\.([1-9][0-9]*).([1-9][0-9]*)"/>
+      <!-- boltons = YY.MINOR.MICRO -->
+      <dataRef name="string" restriction="[1-9][0-9][0-9]?[0-9]?\.([1-9][0-9]*).([1-9][0-9]*)"/>
+      <!-- certifi = YYYY.MM.DD -->
+      <dataRef name="string" restriction="[0-9]{4}\.(1[012]?|2-9)\.(1-9|[12][0-9]|3[01])"/>
+      <!-- fusefs-ntfs = YYYY.MM.DD_MICRO -->
+      <dataRef name="string" restriction="[0-9]{4}\.(1[012]?|2-9)\.(1-9|[12][0-9]|3[01])_([1-9][0-9]*)"/>
+      <!-- LibreOffice = YY.MM -->
+      <dataRef name="string" restriction="[1-9][0-9][0-9]?[0-9]?\.(1[012]?|2-9)"/>
+      <!-- OpenSCAD = YYYY.0M -->
+      <dataRef name="string" restriction="[0-9]{4}\.(0[1-9]|1[0-2])"/>
+      <!-- pip = YY.MINOR.MICRO -->
+      <dataRef name="string" restriction="[1-9][0-9][0-9]?[0-9]?\.([1-9][0-9]*)\.([1-9][0-9]*)"/>
+      <!-- PyCharm = YYYY.MINOR.MICRO -->
+      <dataRef name="string" restriction="[0-9]{4}\.([1-9][0-9]*)\.([1-9][0-9]*)"/>
+      <!-- Stripe’s API = YYYY-MM-DD -->
+      <dataRef name="string" restriction="[0-9]{4}\.(1[012]?|2-9)\.(1-9|[12][0-9]|3[01])"/>
+      <!-- Unity = YYYY.MINOR.MICRO -->
+      <dataRef name="string" restriction="[0-9]{4}\.([1-9][0-9]*)\.([1-9][0-9]*)"/>
+    </alternate>
+  </content>
+  <remarks versionDate="2012-06-17" xml:lang="en">
+    <p>Values of this datatype should follow the rules established by
+    the <ref target="#BIB_calVer">Calendar Versioning</ref>
+    convention, as of 2024-05-21.</p>
+  </remarks>
+</dataSpec>
diff --git a/P5/Source/Specs/teidata.version.semantic.xml b/P5/Source/Specs/teidata.version.semantic.xml
new file mode 100644
index 0000000000..df1dc3989e
--- /dev/null
+++ b/P5/Source/Specs/teidata.version.semantic.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
+<?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
+<dataSpec xmlns="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.version.semantic">
+  <desc versionDate="2024-05-21" xml:lang="en">defines the range of values which may be used as a semantic version number per <ptr target="#BIB_semVer"/>.</desc>
+  <content>
+    <!-- The regular expression for the restriction below is taken
+         from Peter Stadler’s posts to https://github.com/TEIC/TEI/issues/1993. -->
+    <dataRef name="token" restriction="(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-((0|[1-9]\d*|\d*[\-a-zA-Z][\-0-9a-zA-Z]*)(\.(0|[1-9]\d*|\d*[\-a-zA-Z][\-0-9a-zA-Z]*))*))?(\+([\-0-9a-zA-Z]+(\.[\-0-9a-zA-Z]+)*))?"/>
+  </content>
+  <remarks versionDate="2012-06-17" xml:lang="en">
+    <p>Values of this datatype should follow the rules established by
+    the <ref target="#BIB_semVer">Semantic Versioning</ref>
+    specification, version 2.0.0.</p>
+  </remarks>
+</dataSpec>
diff --git a/P5/Source/Specs/teidata.version.teiP5.xml b/P5/Source/Specs/teidata.version.teiP5.xml
new file mode 100644
index 0000000000..5f470203a0
--- /dev/null
+++ b/P5/Source/Specs/teidata.version.teiP5.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
+<?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
+<dataSpec xmlns="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.version.teiP5">
+  <desc versionDate="2024-09-02" xml:lang="en">defines the range of values which may be used as a TEI version number.</desc>
+  <content>
+    <dataRef name="string" restriction="[0-9]+(\.[0-9]+)*[abαβ]?"/>
+  </content>
+</dataSpec>
diff --git a/P5/Source/Specs/teidata.version.xml b/P5/Source/Specs/teidata.version.xml
index e6a9e893e4..f5a13d5658 100644
--- a/P5/Source/Specs/teidata.version.xml
+++ b/P5/Source/Specs/teidata.version.xml
@@ -2,31 +2,20 @@
 <!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
 <?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
 <dataSpec xmlns="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.version">
-  <desc versionDate="2013-11-20" xml:lang="en">defines the range of attribute values which may be used to
-  specify a TEI or Unicode version number.</desc>
-  <desc versionDate="2007-06-12" xml:lang="fr">définit la gamme des valeurs d'attribut
-  exprimant un numéro de version TEI.</desc>
+  <desc versionDate="2024-05-21" xml:lang="en">defines the range of attribute values which may be used to specify a version number.</desc>
+  <desc versionDate="2007-06-12" xml:lang="fr">définit la gamme des valeurs d'attribut exprimant un numéro de version TEI.</desc>
   <desc versionDate="2024-09-02" xml:lang="ja">TEIあるいはUnicodeのバージョン番号を指定するために使用できる属性値の範囲を定義する。</desc>
   <content>
-      <dataRef name="token" restriction="[\d]+(\.[\d]+){0,2}"/>
-   </content>
-  <remarks versionDate="2012-06-17" xml:lang="en">
-      <p>The value of this attribute follows the pattern specified by
-    the Unicode consortium for its version number (<ptr target="https://unicode.org/versions/"/>). A version number
-    contains digits and fullstop characters only. The first number
-    supplied identifies the major version number. A second and third
-    number, for minor and sub-minor version numbers, may also be
-    supplied.
-</p>
-  </remarks>
-  <remarks versionDate="2007-06-12" xml:lang="fr">
-      <p>La valeur de cet attribut devrait suivre le format proposé par
-    le Consortium Unicode pour identifier les versions (<ptr target="https://unicode.org/versions/"/>). Un numéro de version
-    ne contient que des chiffres et des points. Le numéro
-    initiale identifie le numéro majeur de la version. Un deuxième et
-    un troisième numéro sont aussi disponibles pour la numérotation
-    facultative des versions mineures ou sous-mineurs.
-</p>
+    <alternate>
+      <dataRef key="teidata.version.semantic"/>
+      <dataRef key="teidata.version.calendar"/>
+      <dataRef key="teidata.version.Unicode"/>
+      <dataRef key="teidata.version.teiP5"/>
+    </alternate>
+  </content>
+  <remarks versionDate="2024-05-21" xml:lang="en">
+    <p>Values matching this datatype may match any of the various
+    subtypes defined.</p>
   </remarks>
   <remarks versionDate="2024-09-02" xml:lang="ja">
     <p>この属性の値はUnicodeコンソーシアムがバージョン番号のために定めた書式 (<ptr target="http://unicode.org/versions/"></ptr>) に従う。一つのバージョン番号は数字とピリオドのみからなる。与えられた1番目の数字がメジャーバージョンを示す。2番目と3番目の数字をマイナーバージョンとサブマイナーバージョンを示すために付加することができる。</p>
diff --git a/P5/Source/Specs/teidata.versionNumber.xml b/P5/Source/Specs/teidata.versionNumber.xml
deleted file mode 100644
index 3a5006e6d7..0000000000
--- a/P5/Source/Specs/teidata.versionNumber.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
-<?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
-<dataSpec xmlns="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.versionNumber">
-  <desc versionDate="2013-04-14" xml:lang="en">defines the range of attribute values used for version numbers.</desc>
-    <desc versionDate="2024-09-02" xml:lang="ja">バージョン番号に使用される属性値の範囲を定義する。</desc>
-  <content>
-      <dataRef name="token" restriction="[\d]+[a-z]*[\d]*(\.[\d]+[a-z]*[\d]*){0,3}"/>
-   </content>
-  <remarks versionDate="2013-04-14" xml:lang="en">
-      <p/>
-  </remarks>
-</dataSpec>
diff --git a/P5/Source/Specs/transcriptionDesc.xml b/P5/Source/Specs/transcriptionDesc.xml
index 08232bd2a7..486088b31d 100644
--- a/P5/Source/Specs/transcriptionDesc.xml
+++ b/P5/Source/Specs/transcriptionDesc.xml
@@ -26,7 +26,7 @@
             <desc versionDate="2016-02-27" xml:lang="en">supplies a version number for the encoding conventions
                 used, if any.</desc>
             <datatype>
-                <dataRef key="teidata.versionNumber"/>
+                <dataRef key="teidata.version.teiP5"/>
             </datatype>
         </attDef>
     </attList>