diff --git a/xep-0211.xml b/xep-0211.xml
index 2ec315d4..e6b4a5d9 100644
--- a/xep-0211.xml
+++ b/xep-0211.xml
@@ -25,6 +25,12 @@
   <supersededby/>
   <shortname>N/A</shortname>
   &stpeter;
+  <revision>
+    <version>0.5</version>
+    <date>2007-06-18</date>
+    <initials>psa</initials>
+    <remark><p>Removed implementation note about XMPP ICA.</p></remark>
+  </revision>
   <revision>
     <version>0.4</version>
     <date>2007-06-14</date>
@@ -91,11 +97,11 @@
       <td>RECOMMENDED</td>
     </tr>
   </table>
-  <p>* Note: RFC 3920 and RFC 3921 are currently being revised to correct errors, clarify matters that were underspecified, and incorproate feedback based on implementation and deployment experience gained since RFC 3920 and RFC 3921 were published in 2004. Although the compliance level specified herein refers to RFC 3920 and RFC 3921, developers are also advised to consult &rfc3920bis; and &rfc3921bis;, which provide the most up-to-date and accurate description the core XMPP protocols.</p>
+  <p>* Note: RFC 3920 and RFC 3921 are currently being revised to correct errors, clarify matters that were underspecified, and incorporate feedback based on implementation and deployment experience gained since RFC 3920 and RFC 3921 were published in 2004. Although the compliance level specified herein refers to RFC 3920 and RFC 3921, developers are also advised to consult &rfc3920bis; and &rfc3921bis;, which provide the most up-to-date and accurate description the core XMPP protocols.</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>
-  <p>Developers are advised to refer to &xep0178; regarding proper implementation of the SASL EXTERNAL mechanism in XMPP. Given the wide deployment of domain certificates issued by the XMPP Intermediate Certification authority, developers should also consider bundling the root certificate of the &SFSCA; with their software. <note>The root certificate is located at "http://cert.startcom.org/ca.crt", to be superseded in future years by the root certificate located at "http://cert.startcom.org/sfsca.crt". It is not necessary for clients to bundle the ICA certificate since the full certificate chain should be presented by deployed servers.</note></p>
+  <p>Developers are advised to refer to &xep0178; regarding proper implementation of the SASL EXTERNAL mechanism in XMPP.</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 6fb56c69..299a4c9e 100644
--- a/xep-0212.xml
+++ b/xep-0212.xml
@@ -25,6 +25,12 @@
   <supersededby/>
   <shortname>N/A</shortname>
   &stpeter;
+  <revision>
+    <version>0.5</version>
+    <date>2007-06-18</date>
+    <initials>psa</initials>
+    <remark><p>Removed implementation note about XMPP ICA.</p></remark>
+  </revision>
   <revision>
     <version>0.4</version>
     <date>2007-06-15</date>
@@ -91,12 +97,12 @@
       <td>RECOMMENDED</td>
     </tr>
   </table>
-  <p>* Note: RFC 3920 and RFC 3921 are currently being revised to correct errors, clarify matters that were underspecified, and incorproate feedback based on implementation and deployment experience gained since RFC 3920 and RFC 3921 were published in 2004. Although the compliance level specified herein refers to RFC 3920 and RFC 3921, developers are also advised to consult &rfc3920bis; and &rfc3921bis;, which provide the most up-to-date and accurate description the core XMPP protocols.</p>
+  <p>* Note: RFC 3920 and RFC 3921 are currently being revised to correct errors, clarify matters that were underspecified, and incorporate feedback based on implementation and deployment experience gained since RFC 3920 and RFC 3921 were published in 2004. Although the compliance level specified herein refers to RFC 3920 and RFC 3921, developers are also advised to consult &rfc3920bis; and &rfc3921bis;, which provide the most up-to-date and accurate description the core XMPP protocols.</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>
-  <p>Developers are advised to refer to &xep0178; regarding proper implementation of the SASL EXTERNAL mechanism in XMPP. Given the wide deployment of domain certificates issued by the XMPP Intermediate Certification authority, developers should also consider bundling the root certificate of the &SFSCA; with their software. <note>The root certificate is located at "http://cert.startcom.org/ca.crt", to be superseded in future years by the root certificate located at "http://cert.startcom.org/sfsca.crt". It is recommended for servers to also bundle the ICA certificate since the full certificate chain should be presented by deployed servers; the ICA certificate is located at "http://cert.startcom.org/sub.class1.xmpp.ca.crt".</note></p>
+  <p>Developers are advised to refer to &xep0178; regarding proper implementation of the SASL EXTERNAL mechanism in XMPP.</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>