diff --git a/xep-0390.xml b/xep-0390.xml
index 9ae182ed..0ed820e4 100644
--- a/xep-0390.xml
+++ b/xep-0390.xml
@@ -799,13 +799,39 @@ cDp0aW1lHxw=</code>
 
 <section1 topic='XMPP Registrar Considerations' anchor='registrar'>
     <section2 topic='Protocol Namespaces' anchor='ns'>
-    <p>The &REGISTRAR; includes "urn:xmpp:caps" in its registry of protocol namespaces  (see &NAMESPACES;).</p>
+      <p>The &REGISTRAR; includes "urn:xmpp:caps" in its registry of protocol namespaces  (see &NAMESPACES;).</p>
+      <code><![CDATA[
+<ns>
+  <name>urn:xmpp:caps</name>
+  <doc>&xep0390;</doc>
+</ns>
+]]></code>
     </section2>
     <section2 topic='Service Discovery Features' anchor='registrar-features'>
       <p>The XMPP Registrar includes "urn:xmpp:caps" and "urn:xmpp:caps:optimize" in its registry of service discovery features (see &DISCOFEATURES;).</p>
+      <code><![CDATA[
+<var>
+  <name>urn:xmpp:caps</name>
+  <desc>Indicate support for Entity Capabilities 2.0</desc>
+  <doc>&xep0390;</doc>
+</var>
+<var>
+  <name>urn:xmpp:caps:optimize</name>
+  <desc>Indicate support for optimisation of Entity Capabilities 2.0 broadcast.</desc>
+  <doc>&xep0390;</doc>
+</var>]]></code>
     </section2>
     <section2 topic='Stream Features' anchor='registrar-stream-features'>
       <p>The XMPP Registrar includes "urn:xmpp:caps" in its registry of stream features (see &STREAMFEATURES;).</p>
+      <code><![CDATA[
+<feature>
+  <ns>urn:xmpp:caps</ns>
+  <name>ecaps2</name>
+  <element>c</element>
+  <desc>Indicate support for Entity Capabilities 2.0 and publish capabilities to peer.</desc>
+  <doc>&xep0390;</doc>
+</feature>
+]]></code>
     </section2>
 </section1>