diff --git a/xep-template.xml b/xep-template.xml
index 23ad1121..178f9283 100644
--- a/xep-template.xml
+++ b/xep-template.xml
@@ -22,6 +22,9 @@
   <supersedes/>
   <supersededby/>
   <shortname>NOT_YET_ASSIGNED</shortname>
+  <tags>
+    <tag>template</tag>
+  </tags>
   <author>
     <firstname>Peter</firstname>
     <surname>Saint-Andre</surname>
diff --git a/xep.dtd b/xep.dtd
index 4dd6442b..b1162dad 100644
--- a/xep.dtd
+++ b/xep.dtd
@@ -27,7 +27,7 @@ THE SOFTWARE.
 <!ELEMENT xep ( header, section1* ) >
 <!ATTLIST xep
           xmlns CDATA '' >
-<!ELEMENT header ( title, abstract, legal, number, status, lastcall*, interim*, type, sig, approver*, dependencies, supersedes, supersededby, shortname, schemaloc*, registry?, discuss?, expires?, author+, revision+, councilnote? ) >
+<!ELEMENT header ( title, abstract, legal, number, status, lastcall*, interim*, type, sig, approver*, dependencies, supersedes, supersededby, shortname, tags?, schemaloc*, registry?, discuss?, expires?, author+, revision+, councilnote?) >
 <!ELEMENT title (#PCDATA)* >
 <!ELEMENT abstract (#PCDATA)* >
 <!ELEMENT legal ( copyright, permissions, warranty, liability, conformance ) >
@@ -68,6 +68,8 @@ THE SOFTWARE.
 <!ELEMENT initials (#PCDATA)* >
 <!ELEMENT remark (#PCDATA | p | ul)* >
 <!ELEMENT councilnote (#PCDATA)* >
+<!ELEMENT tags ( tag* ) >
+<!ELEMENT tag (#PCDATA)* >
 <!ELEMENT section1 ( div | p | section2 | example | code | cve | ul | ol | dl | table )* >
 <!ATTLIST section1
           topic CDATA ''
diff --git a/xep.xsd b/xep.xsd
index 340898cc..e12b1eeb 100644
--- a/xep.xsd
+++ b/xep.xsd
@@ -70,6 +70,7 @@ THE SOFTWARE.
         <xs:element ref='supersedes'/>
         <xs:element ref='supersededby'/>
         <xs:element name='shortname' type='xs:NCName'/>
+        <xs:element ref='tags' minOccurs='0'/>
         <xs:element ref='schemaloc' minOccurs='0' maxOccurs='unbounded'/>
         <xs:element name='registry' minOccurs='0' type='empty'/>
         <xs:element name='discuss' minOccurs='0' type='xs:string'/>
@@ -196,6 +197,14 @@ THE SOFTWARE.
     </xs:complexType>
   </xs:element>
 
+  <xs:element name='tags'>
+    <xs:complexType>
+      <xs:sequence minOccurs='1' maxOccurs='unbounded'>
+        <xs:element name='tag' type='xs:string'/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
   <xs:element name='remark'>
     <xs:complexType>
       <xs:choice>