diff --git a/xep-0095.xml b/xep-0095.xml
index af546f9c..45f4f5f5 100644
--- a/xep-0095.xml
+++ b/xep-0095.xml
@@ -351,10 +351,10 @@
       </xs:documentation>
     </xs:annotation>
     <xs:complexType>
-      <xs:choice xmlns:fneg='http://jabber.org/protocol/feature-neg'>
-        <xs:element ref='fneg:feature' minOccurs='0'/>
-        <xs:any namespace='##other' minOccurs='0'/>
-      </xs:choice>
+      <xs:all xmlns:fneg='http://jabber.org/protocol/feature-neg'>
+        <xs:element ref='fneg:feature'/>
+        <xs:any namespace='##other'/>
+      </xs:all>
       <xs:attribute name='id' type='xs:string' use='optional'/>
       <xs:attribute name='mime-type' type='xs:string' use='optional'/>
       <xs:attribute name='profile' type='xs:string' use='optional'/>