diff --git a/xep-0232.xml b/xep-0232.xml
index ec794a0e..ea9e5945 100644
--- a/xep-0232.xml
+++ b/xep-0232.xml
@@ -23,6 +23,12 @@
   <supersededby/>
   <shortname>NOT_YET_ASSIGNED</shortname>
   &stpeter;
+  <revision>
+    <version>0.3</version>
+    <date>2009-02-26</date>
+    <initials>psa</initials>
+    <remark><p>Per Last Call feedback, removed icons for presence states; redefined the icon field to use media element per XEP-0221.</p></remark>
+  </revision>
   <revision>
     <version>0.2</version>
     <date>2008-03-14</date>
@@ -69,6 +75,7 @@
   <query xmlns='http://jabber.org/protocol/disco#info'/>
 </iq>
   ]]></example>
+  <p>Upon receiving the disco#info request, the software replies and includes extended information in a data form (&xep0004;), where the icon is communicated using the format defined in &xep0221;.</p>
   <example caption='Client communicates information'><![CDATA[
 <iq from='juliet@capulet.lit/chamber'
     to='romeo@montague.lit/orchard'
@@ -82,19 +89,16 @@
         <value>urn:xmpp:dataforms:softwareinfo</value>
       </field>
       <field var='icon'>
-        <value>http://code.google.com/p/exodus/exodus.png</value>
-      </field>
-      <field var='icon_available'>
-        <value>http://code.google.com/p/exodus/available.png</value>
-      </field>
-      <field var='icon_away'>
-        <value>http://code.google.com/p/exodus/away.png</value>
-      </field>
-      <field var='icon_dnd'>
-        <value>http://code.google.com/p/exodus/dnd.png</value>
-      </field>
-      <field var='icon_xa'>
-        <value>http://code.google.com/p/exodus/xa.png</value>
+        <media xmlns='xmlns='urn:xmpp:media-element'
+               height='80'
+               width='290'>
+          <uri type='image/jpeg'>
+            http://www.shakespeare.lit/clients/exodus.jpg
+          </uri>
+          <uri type='image/jpeg'>
+            cid:sha1+f24030b8d91d233bac14777be5ab531ca3b9f102@bob.xmpp.org
+          </uri>
+        </media>
       </field>
       <field var='os'>
         <value>Windows</value>
@@ -115,11 +119,6 @@
   <p>The fields have the following meaning:</p>
   <ul>
     <li>icon -- A default icon to show for a device running the software</li>
-    <li>icon_available -- An icon to show if a device running the software is online and available</li>
-    <li>icon_away -- An icon to show if a device running the software has a presence status of "away"</li>
-    <li>icon_chat -- An icon to show if a device running the software has a presence status of "chat"</li>
-    <li>icon_dnd -- An icon to show if a device running the software has a presence status of "dnd"</li>
-    <li>icon_xa -- An icon to show if a device running the software has a presence status of "xa"</li>
     <li>os -- The operating system on which the XMPP software is running</li>
     <li>os_version -- The operating system version</li>
     <li>software -- The XMPP software running at the entity (if this field is provided, its value SHOULD override any software name provided as the value of the 'name' attribute in the service discovery &lt;identity/&gt; element)</li>
@@ -152,31 +151,6 @@
       type='text-single'
       label='A URL for an icon representing the software, no matter the
              presence or availability status of the XMPP entity'/>
-  <field
-      var='icon_available'
-      type='text-single'
-      label='A URL for an icon representing the software, to be shown when 
-             an XMPP entity using the software is online and available'/>
-  <field
-      var='icon_away'
-      type='text-single'
-      label='A URL for an icon representing the software, to be shown when 
-             an XMPP entity using the software has a presence status of away'/>
-  <field
-      var='icon_chat'
-      type='text-single'
-      label='A URL for an icon representing the software, to be shown when 
-             an XMPP entity using the software has a presence status of chat'/>
-  <field
-      var='icon_dnd'
-      type='text-single'
-      label='A URL for an icon representing the software, to be shown when 
-             an XMPP entity using the software has a presence status of dnd'/>
-  <field
-      var='icon_xa'
-      type='text-single'
-      label='A URL for an icon representing the software, to be shown when 
-             an XMPP entity using the software has a presence status of xa'/>
   <field
       var='os'
       type='text-single'
@@ -199,7 +173,7 @@
 </section1>
 
 <section1 topic='Acknowledgements' anchor='ack'>
-  <p>Thanks to Joe Hildebrand for his comments.</p>
+  <p>Thanks to Dave Cridland, Olivier Goffart, Joe Hildebrand, Etan Reisner, Remko Tronçon, and Jiří Zárevúcký for their comments.</p>
 </section1>
 
 </xep>