diff --git a/xep.dtd b/xep.dtd
index 942bd16f..a708977f 100644
--- a/xep.dtd
+++ b/xep.dtd
@@ -1,14 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
 <!ELEMENT xep ( header, section1* ) >
+<!ATTLIST xep
+          xmlns CDATA '' >
 <!ELEMENT header ( title, abstract, legal, number, status, type, sig, approver, dependencies, supersedes, supersededby, shortname, schemaloc*, registry?, expires?, author+, revision+ ) >
 <!ELEMENT title (#PCDATA)* >
 <!ELEMENT abstract (#PCDATA)* >
 <!ELEMENT legal ( copyright, permissions, warranty, liability, conformance ) >
-<!ELEMENT conformance (#PCDATA | link)* >
 <!ELEMENT copyright (#PCDATA | link)* >
 <!ELEMENT permissions (#PCDATA | link)* >
 <!ELEMENT warranty (#PCDATA | link)* >
+<!ELEMENT liability (#PCDATA | link)* >
+<!ELEMENT conformance (#PCDATA | link)* >
 <!ELEMENT number (#PCDATA)* >
 <!ELEMENT status (#PCDATA)* >
 <!ELEMENT type (#PCDATA)* >
@@ -99,7 +102,7 @@
 <!ELEMENT em (#PCDATA)* >
 <!ELEMENT strong (#PCDATA)* >
 <!ELEMENT cite (#PCDATA)* >
-<!ELEMENT span (#PCDATA)* >
+<!ELEMENT span (#PCDATA | link | tt | dfn | em | strong )* >
 <!ATTLIST span 
           class CDATA ''
           style CDATA '' >