diff --git a/xep-0130.xml b/xep-0130.xml
index 1a2fe216..fd969565 100644
--- a/xep-0130.xml
+++ b/xep-0130.xml
@@ -988,12 +988,14 @@
 
   <xs:element name='item'>
     <xs:complexType>
-      <xs:choice minOccurs='0' maxOccurs='1'>
-        <xs:all xmlns:xmpp='jabber:client'>
+      <xs:choice minOccurs='0'
+                 maxOccurs='unbounded'
+                 xmlns:xmpp='jabber:client'>
+        <xs:sequence>
           <xs:element ref='uri'/>
           <xs:element ref='name' minOccurs='0'/>
           <xs:element ref='xmpp:error' minOccurs='0'/>
-        </xs:all>
+        </xs:sequence>
         <xs:element ref='remove'/>
       </xs:choice>
       <xs:attribute name='id'