diff --git a/xep-0211.xml b/xep-0211.xml
index 77ea8182..c73a8542 100644
--- a/xep-0211.xml
+++ b/xep-0211.xml
@@ -25,6 +25,12 @@
   <supersededby/>
   <shortname>N/A</shortname>
   &stpeter;
+  <revision>
+    <version>0.3</version>
+    <date>2007-06-11</date>
+    <initials>psa</initials>
+    <remark><p>Changed XMPP Core and XMPP IM references to bis drafts; added implementation notes.</p></remark>
+  </revision>
   <revision>
     <version>0.2</version>
     <date>2007-05-11</date>
@@ -55,12 +61,12 @@
       <th>Requirement Level</th>
     </tr>
     <tr>
-      <td><strong>&rfc3920;</strong></td>
-      <td>REQUIRED</td>
+      <td><strong>&rfc3920bis;</strong></td>
+      <td>REQUIRED *</td>
     </tr>
     <tr>
-      <td><strong>&rfc3921;</strong></td>
-      <td>REQUIRED</td>
+      <td><strong>&rfc3921bis;</strong></td>
+      <td>REQUIRED *</td>
     </tr>
     <tr>
       <td><strong>&xep0030;</strong></td>
@@ -79,7 +85,10 @@
       <td>RECOMMENDED</td>
     </tr>
   </table>
-  <p>Note: Some of these protocols have their own dependencies. In addition, the XMPP RFCs are currently being revised to incorporate errata and feedback based on implementation experience; therefore implementors are advised to refer to &rfc3920bis; and &rfc3921bis; for the most up to date specifications and references.</p>
+  <p>* Note: &xmppcore; and &xmppim; are currently being revised to incorporate errata and feedback based on implementation experience; because it is expected that the revision process will be complete well before this compliance level takes effect, developers are advised to implement the specifications as defined in draft-saintandre-rfc3920bis and draft-saintandre-rfc3921bis rather than RFC 3920 and RFC 3921.</p>
+</section1>
+<section1 topic='Implementation Notes' anchor='impl'>
+  <p>Some of the protocol specifications referenced herein have their own dependencies; developers must refer to the relevant specifications for further information.</p>
 </section1>
 <section1 topic='Security Considerations' anchor='security'>
   <p>This document introduces no additional security considerations above and beyond those defined in the documents on which it depends.</p>
diff --git a/xep-0212.xml b/xep-0212.xml
index 61e9b164..22ef71c7 100644
--- a/xep-0212.xml
+++ b/xep-0212.xml
@@ -19,7 +19,6 @@
     <spec>XEP-0030</spec>
     <spec>XEP-0078</spec>
     <spec>XEP-0086</spec>
-    <spec>XEP-0106</spec>
     <spec>XEP-0115</spec>
     <spec>XEP-0138</spec>
   </dependencies>
@@ -27,6 +26,12 @@
   <supersededby/>
   <shortname>N/A</shortname>
   &stpeter;
+  <revision>
+    <version>0.3</version>
+    <date>2007-06-11</date>
+    <initials>psa</initials>
+    <remark><p>Removed JID Escaping (XEP-0106) as recommended since it applies to native clients but not native servers; changed XMPP Core and XMPP IM references to bis drafts added implementation notes.</p></remark>
+  </revision>
   <revision>
     <version>0.2</version>
     <date>2007-05-11</date>
@@ -57,12 +62,12 @@
       <th>Requirement Level</th>
     </tr>
     <tr>
-      <td><strong>&rfc3920;</strong></td>
-      <td>REQUIRED</td>
+      <td><strong>&rfc3920bis;</strong></td>
+      <td>REQUIRED *</td>
     </tr>
     <tr>
-      <td><strong>&rfc3921;</strong></td>
-      <td>REQUIRED</td>
+      <td><strong>&rfc3921bis;</strong></td>
+      <td>REQUIRED *</td>
     </tr>
     <tr>
       <td><strong>&xep0030;</strong></td>
@@ -70,23 +75,22 @@
     </tr>
     <tr>
       <td><strong>&xep0078;</strong></td>
-      <td>RECOMMENDED*</td>
+      <td>RECOMMENDED **</td>
     </tr>
     <tr>
       <td><strong>&xep0086;</strong></td>
-      <td>RECOMMENDED*</td>
-    </tr>
-    <tr>
-      <td><strong>&xep0106;</strong></td>
-      <td>RECOMMENDED</td>
+      <td>RECOMMENDED **</td>
     </tr>
     <tr>
       <td><strong>&xep0138;</strong></td>
       <td>RECOMMENDED</td>
     </tr>
   </table>
-  <p>Some of these protocols have their own dependencies. In addition, the XMPP RFCs are currently being revised to incorporate errata and feedback based on implementation experience; therefore implementors are advised to refer to &rfc3920bis; and &rfc3921bis; for the most up to date specifications and references.</p>
-  <p>* Note: Support for XEP-0078 and XEP-0086 is recommended for backward compatibility only. It is likely that compliance definitions for future years will remove these recommendations.</p>
+  <p>* Note: &xmppcore; and &xmppim; are currently being revised to incorporate errata and feedback based on implementation experience; because it is expected that the revision process will be complete well before this compliance level takes effect, developers are advised to implement the specifications as defined in draft-saintandre-rfc3920bis and draft-saintandre-rfc3921bis rather than RFC 3920 and RFC 3921.</p>
+  <p>** Note: Support for XEP-0078 and XEP-0086 is recommended for backward compatibility only. It is likely that compliance definitions for future years will remove these recommendations.</p>
+</section1>
+<section1 topic='Implementation Notes' anchor='impl'>
+  <p>Some of the protocol specifications referenced herein have their own dependencies; developers must refer to the relevant specifications for further information.</p>
 </section1>
 <section1 topic='Security Considerations' anchor='security'>
   <p>This document introduces no additional security considerations above and beyond those defined in the documents on which it depends.</p>