diff --git a/xep-0231.xml b/xep-0231.xml
index 08e22d40..ca0b623a 100644
--- a/xep-0231.xml
+++ b/xep-0231.xml
@@ -221,7 +221,7 @@
       <tr>
         <td>type</td>
         <td>The value of the 'type' attribute MUST match the syntax specified in &rfc2045;. That is, the value MUST include a top-level media type, the "/" character, and a subtype; in addition, it MAY include one or more optional parameters (e.g., the "audio/ogg" MIME type in the example shown below includes a "codecs" parameter as specified in &rfc4281;). The "type/subtype" string SHOULD be registered in the &ianamedia;, but MAY be an unregistered or yet-to-be-registered value.</td>
-        <td>REQUIRED</td>
+        <td>REQUIRED if the &lt;data/&gt; element is non-empty</td>
       </tr>
     </table>
     <p>The following example illustrates the format (line endings are provided for readability only).</p>
@@ -304,7 +304,7 @@
         <xs:extension base='xs:base64Binary'>
           <xs:attribute name='cid' type='xs:string' use='required'/>
           <xs:attribute name='max-age' type='xs:nonNegativeInteger' use='optional'/>
-          <xs:attribute name='type' type='xs:string' use='required'/>
+          <xs:attribute name='type' type='xs:string' use='optional'/>
         </xs:extension>
       </xs:simpleContent>
     </xs:complexType>