diff --git a/LICENSE.txt b/LICENSE.txt
index e96fd59a..c9dce3c7 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -7,7 +7,7 @@ conformance statement apply to all XEPs.
 
 ####
 
-This XMPP Extension Protocol is copyright (c) 1999 - 2008 by the XMPP 
+This XMPP Extension Protocol is copyright (c) 1999 - 2009 by the XMPP 
 Standards Foundation (XSF).
 
 Permission is hereby granted, free of charge, to any person obtaining 
diff --git a/all.sh b/all.sh
index 2e2f3f65..644a1e28 100755
--- a/all.sh
+++ b/all.sh
@@ -4,7 +4,7 @@
 
 ## LICENSE ##
 #
-# Copyright (c) 1999 - 2008 XMPP Standards Foundation
+# Copyright (c) 1999 - 2009 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/announce.py b/announce.py
index 023390f9..35d6e10b 100755
--- a/announce.py
+++ b/announce.py
@@ -11,7 +11,7 @@
 
 ## LICENSE ##
 #
-# Copyright (c) 1999 - 2008 XMPP Standards Foundation
+# Copyright (c) 1999 - 2009 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/archive.sh b/archive.sh
index 6522d159..04d18969 100755
--- a/archive.sh
+++ b/archive.sh
@@ -4,7 +4,7 @@
 
 ## LICENSE ##
 #
-# Copyright (c) 1999 - 2008 XMPP Standards Foundation
+# Copyright (c) 1999 - 2009 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/dbupdate.py b/dbupdate.py
index f280e319..fa5d3ec2 100755
--- a/dbupdate.py
+++ b/dbupdate.py
@@ -10,7 +10,7 @@
 
 ## LICENSE ##
 #
-# Copyright (c) 1999 - 2008 XMPP Standards Foundation
+# Copyright (c) 1999 - 2009 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/deferred.py b/deferred.py
index 9a480f64..b0141eeb 100755
--- a/deferred.py
+++ b/deferred.py
@@ -10,7 +10,7 @@
 
 ## LICENSE ##
 #
-# Copyright (c) 1999 - 2008 XMPP Standards Foundation
+# Copyright (c) 1999 - 2009 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/examples.xsl b/examples.xsl
index 08a36ec5..5ce87964 100644
--- a/examples.xsl
+++ b/examples.xsl
@@ -2,7 +2,7 @@
 
 <!--
 
-Copyright (c) 1999 - 2008 XMPP Standards Foundation
+Copyright (c) 1999 - 2009 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/gen.sh b/gen.sh
index a256b921..adaf0717 100755
--- a/gen.sh
+++ b/gen.sh
@@ -5,7 +5,7 @@
 
 ## LICENSE ##
 #
-# Copyright (c) 1999 - 2008 XMPP Standards Foundation
+# Copyright (c) 1999 - 2009 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/inxep.py b/inxep.py
index a2e5ad6f..2f1e2093 100755
--- a/inxep.py
+++ b/inxep.py
@@ -11,7 +11,7 @@
 
 ## LICENSE ##
 #
-# Copyright (c) 1999 - 2008 XMPP Standards Foundation
+# Copyright (c) 1999 - 2009 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/ipr-policy.shtml b/ipr-policy.shtml
index a3d820b1..12fce813 100755
--- a/ipr-policy.shtml
+++ b/ipr-policy.shtml
@@ -58,7 +58,7 @@
 <h2>4.  <a name='legal'></a>Legal Notices</h2>
 <p>All XMPP Extension Protocol (XEP) specifications shall contain the following Legal Notices:</p>
 <blockquote>
-<h3>Copyright</h3>This XMPP Extension Protocol is copyright (c) 1999 - 2008 by the XMPP Standards Foundation (XSF).
+<h3>Copyright</h3>This XMPP Extension Protocol is copyright (c) 1999 - 2009 by the XMPP Standards Foundation (XSF).
 <h3>Permissions</h3>
 <p>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.</p>
 <h3>Disclaimer of Warranty</h3>
diff --git a/lastcall.py b/lastcall.py
index fd213196..a1cbda14 100755
--- a/lastcall.py
+++ b/lastcall.py
@@ -10,7 +10,7 @@
 
 ## LICENSE ##
 #
-# Copyright (c) 1999 - 2008 XMPP Standards Foundation
+# Copyright (c) 1999 - 2009 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/protopage.xsl b/protopage.xsl
index 9521a69e..af915240 100644
--- a/protopage.xsl
+++ b/protopage.xsl
@@ -1,6 +1,6 @@
 <!--
 
-Copyright (c) 1999 - 2008 XMPP Standards Foundation
+Copyright (c) 1999 - 2009 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/protopagegen.sh b/protopagegen.sh
index bdce5f34..267e015b 100755
--- a/protopagegen.sh
+++ b/protopagegen.sh
@@ -4,7 +4,7 @@
 
 ## LICENSE ##
 #
-# Copyright (c) 1999 - 2008 XMPP Standards Foundation
+# Copyright (c) 1999 - 2009 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 db744c29..d4d3281c 100644
--- a/ref.xsl
+++ b/ref.xsl
@@ -2,7 +2,7 @@
 
 <!--
 
-Copyright (c) 1999 - 2008 XMPP Standards Foundation
+Copyright (c) 1999 - 2009 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 0bce979a..34f47d9f 100644
--- a/xep-0001.xml
+++ b/xep-0001.xml
@@ -375,7 +375,7 @@ Experimental ----> Proposed ----> Active
 
 <!--
 
-Copyright (c) 1999 - 2008 XMPP Standards Foundation
+Copyright (c) 1999 - 2009 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-0166.xml b/xep-0166.xml
index e404ee99..d4de02cf 100644
--- a/xep-0166.xml
+++ b/xep-0166.xml
@@ -1263,7 +1263,7 @@ PENDING  o----------------------+   |
     <p>Jingle communications can be enabled through gateways to non-XMPP networks, whose security characteristics can be quite different from those of XMPP networks. (For example, on some SIP networks authentication is optional and "from" addresses can be easily forged.) Care MUST be taken in communicating through such gateways.</p>
   </section2>
   <section2 topic='Information Exposure' anchor='security-info'>
-    <p>Mere negotiation of a Jingle session can expose sensitive information about the parties (e.g., IP addresses). Care MUST be taken in communicating such information, and end-to-end encryption should be used if the parties do not trust the intermediate servers or gateways.</p>
+    <p>Mere negotiation of a Jingle session can expose sensitive information about the parties (e.g., IP addresses). Care MUST be taken in communicating such information, and end-to-end encryption SHOULD be used if the parties do not trust the intermediate servers or gateways.</p>
   </section2>
   <section2 topic='Redirection' anchor='security-redirect'>
     <p>The 'initiator' and 'responder' attributes can be used to redirect a session from one JID to anther JID (i.e., the 'initiator' or 'responder' attribute might not match the 'from' or 'to' attribute of the sender). An application SHOULD NOT accept the redirection unless the bare JIDs match (i.e., the session is being redirected from one authorized resource to another authorized resource associated with the same account).</p>
diff --git a/xep-template.xml b/xep-template.xml
index 903658ae..44c5d7a4 100644
--- a/xep-template.xml
+++ b/xep-template.xml
@@ -9,7 +9,7 @@
   <title>XEP Template</title>
   <abstract>This specification provides an example of the format for XMPP Extension Protocols (XEPs).</abstract>
   <legal>
-    <copyright>This XMPP Extension Protocol is copyright (c) 1999 - 2008 by the XMPP Standards Foundation (XSF).</copyright>
+    <copyright>This XMPP Extension Protocol is copyright (c) 1999 - 2009 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>
diff --git a/xep.dtd b/xep.dtd
index 8a100648..b2a6ab41 100644
--- a/xep.dtd
+++ b/xep.dtd
@@ -2,7 +2,7 @@
 
 <!--
 
-Copyright (c) 1999 - 2008 XMPP Standards Foundation
+Copyright (c) 1999 - 2009 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 15111df0..f6171142 100644
--- a/xep.ent
+++ b/xep.ent
@@ -17,7 +17,7 @@
 
 <!--
 
-Copyright (c) 1999 - 2008 XMPP Standards Foundation
+Copyright (c) 1999 - 2009 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
@@ -217,7 +217,7 @@ THE SOFTWARE.
 
 <!ENTITY LEGALNOTICE "
 <legal>
-<copyright>This XMPP Extension Protocol is copyright (c) 1999 - 2008 by the XMPP Standards Foundation (XSF).</copyright>
+<copyright>This XMPP Extension Protocol is copyright (c) 1999 - 2009 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>
diff --git a/xep.xsd b/xep.xsd
index 9619eb9e..a3f11709 100644
--- a/xep.xsd
+++ b/xep.xsd
@@ -2,7 +2,7 @@
 
 <!--
 
-Copyright (c) 1999 - 2008 XMPP Standards Foundation
+Copyright (c) 1999 - 2009 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.xsl b/xep.xsl
index ff9c3a5b..06834ecf 100644
--- a/xep.xsl
+++ b/xep.xsl
@@ -2,7 +2,7 @@
 
 <!--
 
-Copyright (c) 1999 - 2008 XMPP Standards Foundation
+Copyright (c) 1999 - 2009 XMPP Standards Foundation
 
 Permission is hereby granted, free of charge, to any 
 person obtaining a copy of this software and