diff --git a/xep-0221.xml b/xep-0221.xml
index a86a0c32..10c1515f 100644
--- a/xep-0221.xml
+++ b/xep-0221.xml
@@ -22,6 +22,12 @@
   <shortname>NOT_YET_ASSIGNED</shortname>
   &ianpaterson;
   &stpeter;
+  <revision>
+    <version>0.5</version>
+    <date>2008-08-06</date>
+    <initials>psa</initials>
+    <remark><p>Modified examples to track changes to XEP-0231.</p></remark>
+  </revision>
   <revision>
     <version>0.4</version>
     <date>2008-07-27</date>
@@ -64,19 +70,15 @@
     http://victim.example.com/challenges/speech.wav?F3A6292C
   </uri>
   <uri type='audio/ogg; codecs=speex'>
-    http://victim.example.com/challenges/speech.ogg?F3A6292C
+    cid:eb52a668-63d9-11dd-8065-001143d5d5db@victim.example.com
   </uri>
   <uri type='audio/mpeg'>
     http://victim.example.com/challenges/speech.mp3?F3A6292C
   </uri>
-  <data xmlns='urn:xmpp:tmp:data-element' 
-        alt='An audio file'
-        type='audio/ogg; codecs=speex'>
-    [ ... base64-encoded-audio ... ]
-  </data>
 </media>
   ]]></example>
-  <p>The following example is provided only for the purpose of illustration; consult the specifications for using protocols to see canonical examples.</p>
+  <p>The cid: URI points to data that can be retrieved using the protocol described in &xep0231; and the data element would be included along with the XMPP stanza containing the data form.</p>
+  <p>The following example is provided only for the purpose of illustration; consult the specifications for using protocols (e.g., <cite>XEP-0158</cite>) to see canonical examples.</p>
   <example caption='Inclusion in Data Form'><![CDATA[
 <x xmlns='jabber:x:data' type='form'>
   [ ... ]
@@ -87,8 +89,9 @@
       <uri type='image/jpeg'>
         http://www.victim.com/challenges/ocr.jpeg?F3A6292C
       </uri>
-      <data xmlns='urn:xmpp:tmp:data-element'
-            type='image/jpeg'> ** Base64 encoded image ** </data>
+      <uri type='image/jpeg'>
+        cid:99f2fea6-63e0-11dd-88e6-001143d5d5db@victim.example.com
+      </uri>
     </media>
   </field>
   [ ... ]