diff --git a/ipr-policy.shtml b/ipr-policy.shtml
index 49de6a81..6ed0cf57 100755
--- a/ipr-policy.shtml
+++ b/ipr-policy.shtml
@@ -70,12 +70,12 @@
 </blockquote>
 <hr/>
 <h3>Notes</h3>
-<p><a name='note1'></a>1. For information about XMPP Extension Protocols, see &lt;<a href='http://www.xmpp.org/extensions/'>http://www.xmpp.org/extensions/</a>&gt; and <a href='http://www.xmpp.org/extensions/xep-0001.html'>XEP-0001</a>.</p>
+<p><a name='note1'></a>1. For information about XMPP Extension Protocols, see &lt;<a href='/extensions/'>http://www.xmpp.org/extensions/</a>&gt; and <a href='/extensions/xep-0001.html'>XEP-0001</a>.</p>
 <p><a name='note2'></a>2. For information about intellectual property conservancies, see &lt;<a href='http://www.creativecommons.org/concepts/#ip'>http://www.creativecommons.org/concepts/#ip</a>&gt; as well as M. van Houweling, "Cultivating Open Information Platforms: A Land Trust Model." <cite>Journal of Telecommunications &amp; High Technology Law</cite> 1, no. 1 (2002): 309-23.</p>
 <h3>Acknowledgements</h3>
 <p>Many thanks to Lawrence Lessig and Molly van Houweling for their assistance in formulating this policy.</p>
 <h3>Changelog</h3>
-<p>Version 1.4 (2008-01-17): Modified legal notices to use modified MIT License rather than Creative Commons Attribution License for the purpose of enabling wider distribution of XEP text and examples, including incorporation into free software; added Disclaimer of Warrant and Limitation of Liability.</p>
+<p>Version 1.4 (2008-01-23): Updated legal notices to use modified MIT License rather than Creative Commons Attribution License for the purpose of enabling wider distribution of XEP text and examples, including incorporation into free software; added Disclaimer of Warranty and Limitation of Liability.</p>
 <p>Version 1.3 (2007-01-16): Modified terminology to reflect organizational name change from Jabber Software Foundation (JSF) to XMPP Standards Foundation (XSF).</p>
 <p>Version 1.2 (2006-10-04): Modified terminology to reflect protocol branding change from Jabber to XMPP (e.g., Jabber Enhancement Proposal to XMPP Extension Protocol).</p>
 <p>Version 1.1 (2005-10-04): Replaced Open Publication License with Creative Commons Attribution License.</p>
diff --git a/xep-0001.xml b/xep-0001.xml
index 620ff037..09fd8bc8 100644
--- a/xep-0001.xml
+++ b/xep-0001.xml
@@ -19,6 +19,12 @@
   <supersededby/>
   <shortname>N/A</shortname>
   &stpeter;
+  <revision>
+    <version>1.19</version>
+    <date>2008-01-23</date>
+    <initials>psa</initials>
+    <remark><p>Updated to reflect version 1.4 of XSF IPR Policy.</p></remark>
+  </revision>
   <revision>
     <version>1.18</version>
     <date>2006-12-07</date>
@@ -206,7 +212,7 @@
   <p>Note well that XEP authors must transfer ownership of their protocols (but not implementations thereof) to the XSF. Refer to the &XSFIPR; for details. XEP authors must make sure that they have read, understood, and agreed to the XSF IPR Policy before submitting a proposal to the XMPP Extensions Editor!</p>
   <p>All proposals submitted to the XSF for consideration as XEPs must contain the following information:</p>
   <ol start='1'>
-    <li><p>Legal Notice -- the legal notice must be exactly that which is specified in the XSF IPR Policy</p></li>
+    <li><p>Legal Notices -- the legal notices must be exactly those specified in the XSF IPR Policy</p></li>
     <li><p>Author Information -- first name, last name, email address, and Jabber ID are all required and must be provided for all authors</p></li>
   </ol>
   <p>Finally, Standards Track, Informational, and Historical XEPs must conform to &rfc2119; in the use of terminology regarding requirements levels.</p>
@@ -401,7 +407,7 @@ Experimental ----> Proposed ----> Active
       <xs:sequence>
         <xs:element name='title' type='xs:string'/>
         <xs:element name='abstract' type='xs:string'/>
-        <xs:element name='legal' type='xs:string'/>
+        <xs:element ref='legal'/>
         <xs:element name='number' type='xs:byte'/>
         <xs:element ref='status'/>
         <xs:element ref='type'/> 
@@ -420,6 +426,18 @@ Experimental ----> Proposed ----> Active
     </xs:complexType>
   </xs:element>
 
+  <xs:element name='legal'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name='copyright' type='markup'/>
+        <xs:element name='permissions' type='markup'/>
+        <xs:element name='warranty' type='markup'/>
+        <xs:element name='liability' type='markup'/>
+        <xs:element name='conformance' type='markup'/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
   <xs:element name='status'>
     <xs:simpleType>
       <xs:restriction base='xs:NCNAME'>
@@ -490,8 +508,9 @@ Experimental ----> Proposed ----> Active
         <xs:element name='surname' type='xs:string'/>
         <xs:element name='authornote' type='empty' minOccurs='0'/>
         <xs:element name='org' type='xs:string' minOccurs='0'/>
-        <xs:element name='email' type='xs:string'/>
+        <xs:element name='email' type='xs:string' minOccurs='0'/>
         <xs:element name='jid' type='xs:string' minOccurs='0'/>
+        <xs:element name='uri' type='xs:string' minOccurs='0'/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -605,6 +624,8 @@ Experimental ----> Proposed ----> Active
       <xs:sequence>
         <xs:element ref='li' minOccurs='1' maxOccurs='unbounded'/>
       </xs:sequence>
+      <xs:attribute name='class' type='xs:string' use='optional'/>
+      <xs:attribute name='style' type='xs:string' use='optional'/>
     </xs:complexType>
   </xs:element>
 
@@ -613,8 +634,9 @@ Experimental ----> Proposed ----> Active
       <xs:sequence>
         <xs:element ref='li' minOccurs='1' maxOccurs='unbounded'/>
       </xs:sequence>
+      <xs:attribute name='class' type='xs:string' use='optional'/>
       <xs:attribute name='start' type='xs:byte' use='optional'/>
-      <xs:attribute name='type' type='xs:NCName' use='optional'/>
+      <xs:attribute name='style' type='xs:string' use='optional'/>
     </xs:complexType>
   </xs:element>
 
@@ -705,6 +727,7 @@ Experimental ----> Proposed ----> Active
   <xs:complexType name='markup' type='mixed'>
     <xs:choice minOccurs='0' maxOccurs='unbounded'>
       <xs:element name='cite' type='xs:token'/>
+      <xs:element name='dfn' type='xs:token'/>
       <xs:element name='em' type='xs:token'/>
       <xs:element ref='img'/>
       <xs:element ref='link'/>
diff --git a/xep.dtd b/xep.dtd
index 802173b4..942bd16f 100644
--- a/xep.dtd
+++ b/xep.dtd
@@ -4,7 +4,7 @@
 <!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 ( conformance, copyright, permissions, warranty ) >
+<!ELEMENT legal ( copyright, permissions, warranty, liability, conformance ) >
 <!ELEMENT conformance (#PCDATA | link)* >
 <!ELEMENT copyright (#PCDATA | link)* >
 <!ELEMENT permissions (#PCDATA | link)* >
diff --git a/xep.ent b/xep.ent
index b69c4437..03df9487 100644
--- a/xep.ent
+++ b/xep.ent
@@ -181,10 +181,11 @@
 
 <!ENTITY LEGALNOTICE "
 <legal>
-<conformance>This XMPP Extension Protocol has been contributed in full conformance with the XSF's Intellectual Property Rights Policy (a copy of which may be found at &lt;<link url='http://www.xmpp.org/extensions/ipr-policy.shtml'>http://www.xmpp.org/extensions/ipr-policy.shtml</link>&gt; or obtained by writing to XSF, P.O. Box 1641, Denver, CO 80201 USA).</conformance>
 <copyright>This XMPP Extension Protocol is copyright (c) 1999 - 2008 by the XMPP Standards Foundation (XSF).</copyright>
-<permissions>This material may be distributed only subject to the terms and conditions set forth in the Creative Commons Attribution License (&lt;<link url='http://creativecommons.org/licenses/by/2.5/'>http://creativecommons.org/licenses/by/2.5/</link>&gt;).</permissions>
-<warranty>THIS SPECIFICATION IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR, OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE, ARISING FROM, OUT OF, OR IN CONNECTION WITH THE SPECIFICATION OR THE IMPLEMENTATION, DEPLOYMENT, OR OTHER USE OF THE SPECIFICATION.</warranty>
+<permissions>Permission is hereby granted, free of charge, to any person obtaining a copy of this specification (the &quot;Specification&quot;), to make use of the Specification without restriction, including without limitation the rights to implement the Specification in a software program, deploy the Specification in a network service, and copy, modify, merge, publish, translate, distribute, sublicense, or sell copies of the Specification, and to permit persons to whom the Specification is furnished to do so, subject to the condition that the foregoing copyright notice and this permission notice shall be included in all copies or substantial portions of the Specification. Unless separate permission is granted, modified works that are redistributed shall not contain misleading information regarding the authors, title, number, or publisher of the Specification, and shall not claim endorsement of the modified works by the authors, any organization or project to which the authors belong, or the XMPP Standards Foundation.</permissions>
+<warranty>## NOTE WELL: This Specification is provided on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. In no event shall the XMPP Standards Foundation or the authors of this Specification be liable for any claim, damages, or other liability, whether in an action of contract, tort, or otherwise, arising from, out of, or in connection with the Specification or the implementation, deployment, or other use of the Specification. ##</warranty>
+<liability>In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall the XMPP Standards Foundation or any author of this Specification be liable for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising out of the use or inability to use the Specification (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if the XMPP Standards Foundation or such author has been advised of the possibility of such damages.</liability>
+<conformance>This XMPP Extension Protocol has been contributed in full conformance with the XSF's Intellectual Property Rights Policy (a copy of which may be found at &lt;<link url='http://www.xmpp.org/extensions/ipr-policy.shtml'>http://www.xmpp.org/extensions/ipr-policy.shtml</link>&gt; or obtained by writing to XSF, P.O. Box 1641, Denver, CO 80201 USA).</conformance>
 </legal>" >
 
 <!-- other XSF-related text shortcuts -->
diff --git a/xep.xsd b/xep.xsd
index c1dc748f..4f64e252 100644
--- a/xep.xsd
+++ b/xep.xsd
@@ -56,10 +56,11 @@
   <xs:element name='legal'>
     <xs:complexType>
       <xs:sequence>
-        <xs:element name='conformance' type='markup'/>
         <xs:element name='copyright' type='markup'/>
         <xs:element name='permissions' type='markup'/>
         <xs:element name='warranty' type='markup'/>
+        <xs:element name='liability' type='markup'/>
+        <xs:element name='conformance' type='markup'/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
diff --git a/xep.xsl b/xep.xsl
index 2f6c311b..1794b642 100644
--- a/xep.xsl
+++ b/xep.xsl
@@ -215,13 +215,16 @@
               Wiki Page: &lt;<a href='{$wikiURL}'><xsl:value-of select='$wikiURL'/></a>&gt;
             </xsl:if>
           </p>
+        <hr />
         <!-- AUTHOR INFO -->
         <h2>Author Information</h2>
         <div class='indent'>
           <xsl:apply-templates select='/xep/header/author'/>
         </div>
-        <!-- LEGAL NOTICE -->
+        <hr />
+        <!-- LEGAL NOTICES -->
         <xsl:apply-templates select='/xep/header/legal'/>
+        <hr />
         <!-- DISCUSSION VENUE -->
         <h2>Discussion Venue</h2>
         <xsl:variable name='Approver' select='/xep/header/approver'/>
@@ -237,6 +240,7 @@
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
+        <p>Errata may be sent to &lt;<a href='mailto:editor@xmpp.org'>editor@xmpp.org</a>&gt;.</p>
         <!-- XMPP NOTICE AND CONFORMANCE TERMS-->
         <!-- (we don't put these on Procedural XEPs) -->
         <xsl:if test='$thetype = "Standards Track" or $thetype = "Historical" or $thetype = "Informational"'>
@@ -352,16 +356,18 @@
   <xsl:template match='legal'>
     <h2>Legal Notices</h2>
     <div class='indent'>
-      <h3>IPR Conformance</h3>
-      <xsl:apply-templates select='/xep/header/legal/conformance'/>
       <h3>Copyright</h3>
       <xsl:apply-templates select='/xep/header/legal/copyright'/>
       <h3>Permissions</h3>
       <xsl:apply-templates select='/xep/header/legal/permissions'/>
-      <!--
-      h3>Warranty</h3>
-      <xsl:apply-templates select='/xep/header/legal/warranty'/>
-      -->
+      <h3>Disclaimer of Warranty</h3>
+      <span style='font-weight: bold'>
+        <xsl:apply-templates select='/xep/header/legal/warranty'/>
+      </span>
+      <h3>Limitation of Liability</h3>
+      <xsl:apply-templates select='/xep/header/legal/liability'/>
+      <h3>IPR Conformance</h3>
+      <xsl:apply-templates select='/xep/header/legal/conformance'/>
     </div>
   </xsl:template>