diff --git a/xep-0136.xml b/xep-0136.xml
index dfc45cc7..e10195c0 100644
--- a/xep-0136.xml
+++ b/xep-0136.xml
@@ -46,10 +46,10 @@
     <email>asterix@lagaule.org</email>
   </author>
   <revision>
-    <version>1.2rc1</version>
-    <date>in progress, last updated 2010-01-06</date>
+    <version>1.2</version>
+    <date>2010-06-21</date>
     <initials>at/yl</initials>
-    <remark><p>Added persistent auto save setting; added ability to control settings per chat session.</p></remark>
+    <remark><p>Added persistent auto save setting and ability to control settings per chat session; XMPP Council added a statement regarding a future review and simplification of this protocol.</p></remark>
   </revision>
   <revision>
     <version>1.1</version>
@@ -174,6 +174,7 @@
 </header>
 
 <section1 topic='Introduction' anchor='intro'>
+  <p class='box'><em>Notice (2010-06-21): The &COUNCIL; believes that the Message Archiving protocol is unduly complex and will likely request a thorough review and simplification of this specification before advancing it to Final.</em></p>
   <p>Many XMPP clients implement some form of client-side message archiving. However, it is not always convenient or even possible to archive messages locally, e.g., because it is easier to keep all archives in one universally accessible place (not scattered around on multiple computers or devices) or because the client operates in a web browser or resides on a mobile device that does not have sufficient local storage for message archiving. In addition, server-side archiving makes it possible to offer new services such as integration of instant messaging and email. Therefore it is beneficial to define methods for server-side archiving of XMPP messages.</p>
   <p>There are two main approaches to this problem:</p>
   <ol start='1'>