diff --git a/xep-0384.xml b/xep-0384.xml
index 72ed4b40..60a23140 100644
--- a/xep-0384.xml
+++ b/xep-0384.xml
@@ -4,8 +4,8 @@
   <!ENTITY payload "&lt;payload/&gt;">
   <!ENTITY % ents SYSTEM "xep.ent">
   <!ENTITY ns "urn:xmpp:omemo:2">
-  <!ENTITY nsdevices "urn:xmpp:omemo:1:devices">
-  <!ENTITY nsbundles "urn:xmpp:omemo:1:bundles">
+  <!ENTITY nsdevices "urn:xmpp:omemo:2:devices">
+  <!ENTITY nsbundles "urn:xmpp:omemo:2:bundles">
 %ents;
 ]>
 <?xml-stylesheet type='text/xsl' href='xep.xsl'?>
@@ -57,6 +57,18 @@
     <email>xmpp@larma.de</email>
     <jid>jabber@larma.de</jid>
   </author>
+  <revision>
+    <version>0.8.1</version>
+    <date>2021-10-07</date>
+    <initials>melvo</initials>
+    <remark>
+      <p>Adjust remaining namespaces:</p>
+      <ul>
+        <li>Update namespace to 'urn:xmpp:omemo:2:bundles'</li>
+        <li>Update namespace to 'urn:xmpp:omemo:2:devices'</li>
+      </ul>
+    </remark>
+  </revision>
   <revision>
     <version>0.8.0</version>
     <date>2021-09-28</date>