diff --git a/xep-0313.xml b/xep-0313.xml
index b90e39e4..0c2511d7 100644
--- a/xep-0313.xml
+++ b/xep-0313.xml
@@ -878,6 +878,76 @@
 </section1>
 
 <section1 topic='XMPP Registrar Considerations' anchor='registrar'>
+  <section2 topic='Protocol Namespaces' anchor='registrar-ns'>
+    <p>This specification defines the following XML namespace:</p>
+    <ul>
+      <li>urn:xmpp:mam:2</li>
+    </ul>
+    <p>
+      Upon advancement of this specification from a status of Experimental to a
+      status of Draft, the &REGISTRAR; shall add the foregoing namespace to the
+      registry located at &DISCOFEATURES; as described in Section 4 of
+      &xep0053;.
+    </p>
+    <code caption='Service Discovery Features Registry Submission'><![CDATA[
+<var>
+  <name>urn:xmpp:mam:2</name>
+  <desc>Support for Message Archive Management.</desc>
+  <doc>&xep0313;</doc>
+</var>]]></code>
+    <p>
+      The &REGISTRAR; shall also add the foregoing namespace to the Jabber/XMPP
+      Protocol Namespaces Registry located at &NAMESPACES;.
+    </p>
+    <code caption='Jabber/XMPP Protocol Namespaces Registry Submission'><![CDATA[
+<ns>
+  <name>urn:xmpp:mam:2</name>
+  <doc>&xep0313;</doc>
+</ns>]]></code>
+  </section2>
+  <section2 topic='Form Types' anchor='registrar-form'>
+    <p>
+      This specification defines the following form types:
+    </p>
+    <ul>
+      <li>urn:xmpp:mam:2</li>
+    </ul>
+    <p>
+      Upon advancement of this specification from a status of Experimental to a
+      status of Draft, the &REGISTRAR; shall add the foregoing namespace to the
+      registry located at &FORMTYPES; as described in &xep0068;.
+    </p>
+    <code caption='FORM_TYPEs Registry Submission'><![CDATA[
+<form_type>
+  <name>urn:xmpp:mam:2</name>
+  <doc>&xep0313;</doc>
+  <desc>Query for items in a message archive.</desc>
+  <field
+      var='with'
+      type='jid-single'
+      label='A JID that should appear in query results to or from attributes.'/>
+  <field
+      var='start'
+      type='text-single'
+      label='A timestamp indicating the earliest message in the query results.'/>
+  <field
+      var='end'
+      type='text-single'
+      label='A timestamp indicating the latest message in the query results.'/>
+  <field
+      var='before-id'
+      type='text-single'
+      label='A stanza ID indicating the last message in the query results.'/>
+  <field
+      var='after-id'
+      type='text-single'
+      label='A stanza ID indicating the first message in the query results.'/>
+  <field
+      var='ids'
+      type='text-multi'
+      label='A list of stanza IDs corresponding to messages that should be included in query results.'/>
+</form_type>]]></code>
+  </section2>
 </section1>
 
 <section1 topic='Acknowledgements' anchor='acks'>