diff --git a/LICENSE.txt b/LICENSE.txt
index e0efb1c9..731d9948 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,55 +1,55 @@
 
-Unless otherwise indicated, all files in this repository are XMPP 
-Extension Protocols (XEPs) published by the XMPP Standards Foundation 
-in accordance with the XSF's Intellectual Property Rights Policy. The 
-following copyrights, permissions, warranty, liability statement, and 
+Unless otherwise indicated, all files in this repository are XMPP
+Extension Protocols (XEPs) published by the XMPP Standards Foundation
+in accordance with the XSF's Intellectual Property Rights Policy. The
+following copyrights, permissions, warranty, liability statement, and
 conformance statement apply to all XEPs.
 
 ####
 
-This XMPP Extension Protocol is copyright (c) 1999 - 2010 by the XMPP 
+This XMPP Extension Protocol is copyright (c) 1999 - 2017 by the XMPP
 Standards Foundation (XSF).
 
-Permission is hereby granted, free of charge, to any person obtaining 
-a copy of this specification (the "Specification"), 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 
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this specification (the "Specification"), 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.
 
-## NOTE WELL: This Specification is provided on an "AS IS" 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, 
+## NOTE WELL: This Specification is provided on an "AS IS" 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. ##
 
-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 
+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.
 
-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 http://www.xmpp.org/extensions/ipr-policy.shtml or obtained 
+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 http://www.xmpp.org/extensions/ipr-policy.shtml or obtained
 by writing to XSF, P.O. Box 1641, Denver, CO 80201 USA).
 
diff --git a/examples.xsl b/examples.xsl
index 57bd790d..42834ec5 100644
--- a/examples.xsl
+++ b/examples.xsl
@@ -2,7 +2,7 @@
 
 <!--
 
-Copyright (c) 1999 - 2011 XMPP Standards Foundation
+Copyright (c) 1999 - 2017 XMPP Standards Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/inbox/multistage-ibr.xml b/inbox/multistage-ibr.xml
index 4cba0f1e..69febf50 100644
--- a/inbox/multistage-ibr.xml
+++ b/inbox/multistage-ibr.xml
@@ -8,13 +8,7 @@
 <header>
   <title>Multi-stage IBR</title>
   <abstract>This specification defines an augmentation of In-Band Registration to allow for multiple stages of user input.</abstract>
-  <legal>
-    <copyright>This XMPP Extension Protocol is copyright (c) 2016 by the XMPP Standards Foundation (XSF).</copyright>
-    <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://xmpp.org/extensions/ipr-policy.shtml'>http://xmpp.org/extensions/ipr-policy.shtml</link>&gt; or obtained by writing to XSF, P.O. Box 1641, Denver, CO 80201 USA).</conformance>
-  </legal>
+  &LEGALNOTICE;
   <number>xxxx</number>
   <status>ProtoXEP</status>
   <type>Standards Track</type>
diff --git a/inbox/token-reconnection.xml b/inbox/token-reconnection.xml
index 251539a0..b8aab13a 100644
--- a/inbox/token-reconnection.xml
+++ b/inbox/token-reconnection.xml
@@ -8,13 +8,7 @@
 <header>
   <title>Token-based reconnection</title>
   <abstract>This specification defines a token-based session authentication mechanism.</abstract>
-  <legal>
-    <copyright>This XMPP Extension Protocol is copyright (c) 1999 - 2016 by the XMPP Standards Foundation (XSF).</copyright>
-    <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://xmpp.org/extensions/ipr-policy.shtml'>http://xmpp.org/extensions/ipr-policy.shtml</link>&gt; or obtained by writing to XSF, P.O. Box 1641, Denver, CO 80201 USA).</conformance>
-  </legal>
+  &LEGALNOTICE;
   <number>xxxx</number>
   <status>ProtoXEP</status>
   <type>Standards Track</type>
diff --git a/protopage.xsl b/protopage.xsl
index 12196709..4c6c9d51 100644
--- a/protopage.xsl
+++ b/protopage.xsl
@@ -1,6 +1,6 @@
 <!--
 
-Copyright (c) 1999 - 2010 XMPP Standards Foundation
+Copyright (c) 1999 - 2017 XMPP Standards Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/ref.xsl b/ref.xsl
index 9861a133..7848a555 100644
--- a/ref.xsl
+++ b/ref.xsl
@@ -2,7 +2,7 @@
 
 <!--
 
-Copyright (c) 1999 - 2010 XMPP Standards Foundation
+Copyright (c) 1999 - 2017 XMPP Standards Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/xep-0001.xml b/xep-0001.xml
index 2f728837..04950502 100644
--- a/xep-0001.xml
+++ b/xep-0001.xml
@@ -421,7 +421,7 @@ Experimental ----> Proposed ----> Active
 
 <!--
 
-Copyright (c) 1999 - 2010 XMPP Standards Foundation
+Copyright (c) 1999 - 2017 XMPP Standards Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/xep-0292.xml b/xep-0292.xml
index 4386361a..ccde565b 100644
--- a/xep-0292.xml
+++ b/xep-0292.xml
@@ -693,7 +693,7 @@ property-key = element key {
 
 <!--
 
-Copyright (c) 1999 - 2013 XMPP Standards Foundation
+Copyright (c) 1999 - 2017 XMPP Standards Foundation
 
 Permission is hereby granted, free of charge, to any 
 person obtaining a copy of this software and 
diff --git a/xep-0349.xml b/xep-0349.xml
index b90698d6..7300df54 100644
--- a/xep-0349.xml
+++ b/xep-0349.xml
@@ -8,13 +8,7 @@
 <header>
   <title>Rayo Clustering</title>
   <abstract>This specification describes an extension to the Rayo protocol to support clustering of Rayo servers and their presentation as a unified service.</abstract>
-  <legal>
-    <copyright>This XMPP Extension Protocol is copyright (c) 2014 by the XMPP Standards Foundation (XSF).</copyright>
-    <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>
+  &LEGALNOTICE;
   <number>0349</number>
   <status>Experimental</status>
   <type>Standards Track</type>
diff --git a/xep-0351.xml b/xep-0351.xml
index c936c9e1..c8f5f646 100644
--- a/xep-0351.xml
+++ b/xep-0351.xml
@@ -8,13 +8,7 @@
 <header>
   <title>Recipient Server Side Notifications Filtering</title>
   <abstract>This specification defines a modern efficient way to deliver PubSub notifications.</abstract>
-  <legal>
-    <copyright>This XMPP Extension Protocol is copyright (c) 1999 - 2014 by the XMPP Standards Foundation (XSF).</copyright>
-    <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://xmpp.org/extensions/ipr-policy.shtml'>http://xmpp.org/extensions/ipr-policy.shtml</link>&gt; or obtained by writing to XSF, P.O. Box 1641, Denver, CO 80201 USA).</conformance>
-  </legal>
+  &LEGALNOTICE;
   <number>0351</number>
   <status>Experimental</status>
   <type>Standards Track</type>
diff --git a/xep-0354.xml b/xep-0354.xml
index 9f3ce664..52137a57 100644
--- a/xep-0354.xml
+++ b/xep-0354.xml
@@ -8,13 +8,7 @@
 <header>
   <title>Customizable Message Routing</title>
   <abstract>This specification specifies customizable behavior of RFC 6121 section 8.5.2.1.1 to allow various message routing algorithms (e.g., for load balancing).</abstract>
-  <legal>
-    <copyright>This XMPP Extension Protocol is copyright (c) 1999 - 2014 by the XMPP Standards Foundation (XSF).</copyright>
-    <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://xmpp.org/extensions/ipr-policy.shtml'>http://xmpp.org/extensions/ipr-policy.shtml</link>&gt; or obtained by writing to XSF, P.O. Box 1641, Denver, CO 80201 USA).</conformance>
-  </legal>
+  &LEGALNOTICE;
   <number>0354</number>
   <status>Experimental</status>
   <type>Standards Track</type>
diff --git a/xep-0368.xml b/xep-0368.xml
index 84cd40f8..7993366f 100644
--- a/xep-0368.xml
+++ b/xep-0368.xml
@@ -11,13 +11,7 @@
 <header>
   <title>SRV records for XMPP over TLS</title>
   <abstract>This specification defines a procedure to look up xmpps-client/xmpps-server SRV records (for TLS connections) in addition to xmpp-client/xmpp-server and mix weights/priorities.</abstract>
-  <legal>
-    <copyright>This XMPP Extension Protocol is copyright (c) 1999 - 2014 by the XMPP Standards Foundation (XSF).</copyright>
-    <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://xmpp.org/extensions/ipr-policy.shtml'>http://xmpp.org/extensions/ipr-policy.shtml</link>&gt; or obtained by writing to XSF, P.O. Box 1641, Denver, CO 80201 USA).</conformance>
-  </legal>
+  &LEGALNOTICE;
   <number>0368</number>
   <status>Experimental</status>
   <type>Standards Track</type>
diff --git a/xep.dtd b/xep.dtd
index 9aade7e4..53250f68 100644
--- a/xep.dtd
+++ b/xep.dtd
@@ -2,7 +2,7 @@
 
 <!--
 
-Copyright (c) 1999 - 2010 XMPP Standards Foundation
+Copyright (c) 1999 - 2017 XMPP Standards Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/xep.ent b/xep.ent
index eea435de..dc467aa2 100644
--- a/xep.ent
+++ b/xep.ent
@@ -17,7 +17,7 @@
 
 <!--
 
-Copyright (c) 1999 - 2016 XMPP Standards Foundation
+Copyright (c) 1999 - 2017 XMPP Standards Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -223,7 +223,7 @@ THE SOFTWARE.
 
 <!ENTITY LEGALNOTICE "
 <legal>
-<copyright>This XMPP Extension Protocol is copyright &#169; 1999 - 2016 by the <link url='http://xmpp.org/'>XMPP Standards Foundation</link> (XSF).</copyright>
+<copyright>This XMPP Extension Protocol is copyright &#169; 1999 &#x2013; 2017 by the <link url='http://xmpp.org/'>XMPP Standards Foundation</link> (XSF).</copyright>
 <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. ##</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 from, out of, or in connection with the Specification or the implementation, deployment, or other use of 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>
diff --git a/xep.xsd b/xep.xsd
index 09051981..65e0cb29 100644
--- a/xep.xsd
+++ b/xep.xsd
@@ -2,7 +2,7 @@
 
 <!--
 
-Copyright (c) 1999 - 2010 XMPP Standards Foundation
+Copyright (c) 1999 - 2017 XMPP Standards Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -34,13 +34,13 @@ THE SOFTWARE.
     <xs:annotation>
       <xs:documentation>
 
-        This schema defines the document format for XMPP Extension 
+        This schema defines the document format for XMPP Extension
         Protocols (XEPs). For further information about XEPs, visit:
 
-           http://www.xmpp.org/extensions/ 
-        
+           http://www.xmpp.org/extensions/
+
         The canonical URL for this schema is:
-        
+
            http://www.xmpp.org/extensions/xep.xsd
 
       </xs:documentation>
diff --git a/xep.xsl b/xep.xsl
index 32f911ab..890de383 100644
--- a/xep.xsl
+++ b/xep.xsl
@@ -4,28 +4,28 @@
 
 Copyright (c) 1999 - 2017 XMPP Standards Foundation
 
-Permission is hereby granted, free of charge, to any 
-person obtaining a copy of this software and 
-associated documentation files (the "Software"), to 
-deal in the Software without restriction, including 
-without limitation the rights to use, copy, modify, 
-merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom 
-the Software is furnished to do so, subject to the 
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and
+associated documentation files (the "Software"), to
+deal in the Software without restriction, including
+without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the
 following conditions:
 
-The above copyright notice and this permission notice 
-shall be included in all copies or substantial portions 
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
 of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", 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 SOFTWARE OR THE USE 
+THE SOFTWARE IS PROVIDED "AS IS", 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 SOFTWARE OR THE USE
 OR OTHER DEALINGS IN THE SOFTWARE.
 
 -->
@@ -133,7 +133,7 @@ OR OTHER DEALINGS IN THE SOFTWARE.
           </xsl:if>
           <tr valign='top'>
             <td><strong>Copyright:</strong></td>
-            <td>&#169; 1999 - 2016 XMPP Standards Foundation. <a href='#appendix-legal'>SEE LEGAL NOTICES</a>.</td>
+            <td>&#169; 1999 &#x2013; 2017 XMPP Standards Foundation. <a href='#appendix-legal'>SEE LEGAL NOTICES</a>.</td>
           </tr>
           <tr valign='top'>
             <td><strong>Status:</strong></td>
@@ -232,7 +232,7 @@ OR OTHER DEALINGS IN THE SOFTWARE.
             Series: <a href='http://xmpp.org/extensions/'>XEP</a><br />
             Number: <xsl:value-of select='/xep/header/number'/><br />
             Publisher: <a href='/xsf/'>XMPP Standards Foundation</a><br />
-            Status: 
+            Status:
             <a>
               <xsl:attribute name='href'><xsl:text>http://xmpp.org/extensions/xep-0001.html#states-</xsl:text><xsl:value-of select='/xep/header/status'/></xsl:attribute>
               <xsl:value-of select='/xep/header/status'/>
@@ -305,7 +305,7 @@ OR OTHER DEALINGS IN THE SOFTWARE.
             </xsl:if>
             <xsl:variable name='reg.count' select='count(/xep/header/registry)'/>
             <xsl:if test='$reg.count=1'>
-              Registry: 
+              Registry:
               <xsl:variable name='registryURL'>
                 <xsl:text>http://xmpp.org/registrar/</xsl:text>
                 <xsl:value-of select='/xep/header/shortname'/>
@@ -320,7 +320,7 @@ OR OTHER DEALINGS IN THE SOFTWARE.
               <xsl:text>.xml</xsl:text>
             </xsl:variable>
             <xsl:if test='$thestatus != "ProtoXEP"'>
-              Source Control: 
+              Source Control:
                 <a class='standardsButton' href='{$sourceHTML}'>HTML</a>
                 <br />
             </xsl:if>
@@ -334,7 +334,7 @@ OR OTHER DEALINGS IN THE SOFTWARE.
                 <xsl:value-of select='/xep/header/number'/>
                 <xsl:text>.pdf</xsl:text>
             </xsl:variable>
-            This document in other formats: 
+            This document in other formats:
                 <a class='standardsButton' href='{$formatXML}'>XML</a>&#160;
                 <a class='standardsButton' href='{$formatPDF}'>PDF</a>
           </p>
@@ -400,7 +400,7 @@ OR OTHER DEALINGS IN THE SOFTWARE.
           <xsl:for-each select="//note">
             <xsl:variable name='me' select='.' />
             <xsl:variable name='firstOccurrence' select='(//note[. = $me])[1]' />
-            <xsl:variable name='oid' select='generate-id($firstOccurrence)' /> 
+            <xsl:variable name='oid' select='generate-id($firstOccurrence)' />
             <xsl:variable name='notenum' select='count($firstOccurrence/preceding::note[not(.=preceding::note)])+1' />
             <xsl:if test='generate-id($me) = generate-id($firstOccurrence)'>
               <p>
@@ -454,7 +454,7 @@ OR OTHER DEALINGS IN THE SOFTWARE.
     </p>
     </div>
   </xsl:template>
-  
+
   <xsl:template match='councilnote'>
     <hr />
     <div>
@@ -496,7 +496,7 @@ OR OTHER DEALINGS IN THE SOFTWARE.
         <br />
       </xsl:if>
       <xsl:if test='$jid.count=1'>
-        JabberID: 
+        JabberID:
         <a>
           <xsl:attribute name='href'>
             <xsl:text>xmpp:</xsl:text>
@@ -507,7 +507,7 @@ OR OTHER DEALINGS IN THE SOFTWARE.
         <br />
       </xsl:if>
       <xsl:if test='$uri.count=1'>
-        URI: 
+        URI:
         <a>
           <xsl:attribute name='href'>
             <xsl:value-of select='uri' />
@@ -993,7 +993,7 @@ OR OTHER DEALINGS IN THE SOFTWARE.
   <xsl:template match='note'>
     <xsl:variable name='me' select='.' />
     <xsl:variable name='firstOccurrence' select='(//note[. = $me])[1]' />
-    <xsl:variable name='oid' select='generate-id($firstOccurrence)' /> 
+    <xsl:variable name='oid' select='generate-id($firstOccurrence)' />
     <xsl:variable name='notenum' select='count($firstOccurrence/preceding::note[not(.=preceding::note)])+1' />
     <xsl:text> [</xsl:text><a href='#nt-{$oid}'>
     <xsl:value-of select='$notenum'/></a>
diff --git a/xep2texml.xsl b/xep2texml.xsl
index 2a6765df..8e2af75e 100644
--- a/xep2texml.xsl
+++ b/xep2texml.xsl
@@ -1,6 +1,6 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:str="http://xsltsl.org/string">
 <!--
-  * Copyright (c) 2008 - 2010, Tobias Markmann
+  * Copyright (c) 2008 - 2017 Tobias Markmann
   * All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without