diff --git a/xep-0025.xml b/xep-0025.xml
index 1308a1d9..c6b2a8fd 100644
--- a/xep-0025.xml
+++ b/xep-0025.xml
@@ -148,9 +148,9 @@
       sending any session errors as specially-formatted identifiers.
     </p>
     <p>The client sends requests with bodies in the following format:</p>
-      <example caption="Request Format">
+      <code>
           identifier ; key [ ; new_key] , [xml_body]
-      </example>
+      </code>
       <p>If the identifier is zero, key indicates an initial key. In this case,
       new_key should not be specified, and must be ignored.</p>
       <table caption="Request Values">
@@ -231,10 +231,10 @@
       sending messages and receiving incoming traffic from another machine.
     </p>
     <p>The key algorithm should be familiar with those with knowledge of Jabber zero-knowledge authentication.</p>
-    <example caption="Key Algorithm">
+    <code>
         K(n, seed) = Base64Encode(SHA1(K(n - 1, seed))), for n &gt; 0
         K(0, seed) = seed, which is client-determined
-    </example>
+    </code>
     <p>Note: Base64 encoding is defined in &rfc3548;. SHA1 is defined in &rfc3174;.</p>
     <p>
       No framing is implied by a single request or reply. A single request can