diff --git a/docs/specs/swh.xsd b/docs/specs/swh.xsd
index 56517eb0..bcc45eed 100644
--- a/docs/specs/swh.xsd
+++ b/docs/specs/swh.xsd
@@ -1,60 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
             targetNamespace="https://www.softwareheritage.org/schema/2018/deposit"
             xmlns:swh="https://www.softwareheritage.org/schema/2018/deposit"
             elementFormDefault="qualified"
             >
   <xsd:element name="deposit">
     <xsd:complexType>
-      <xsd:sequence>
-        <xsd:complexType>
-          <xsd:choice>
-            <!-- code deposit on a new origin -->
-            <xsd:element name="create_origin" >
-              <xsd:complexType>
-                <xsd:element ref="swh:origin" />
-              </xsd:complexType>
-            </xsd:element>
+      <xsd:all>
+        <!-- note that "create_origin", "add_to_origin", and "reference" are
+             mutually exclusive -->
 
-            <!-- code deposit on an origin already created by a previous deposit -->
-            <xsd:element name="add_to_origin" >
-              <xsd:complexType>
-                <xsd:element ref="swh:origin" />
-              </xsd:complexType>
-            </xsd:element>
+        <!-- code deposit on a new origin -->
+        <xsd:element name="create_origin" minOccurs="0">
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element ref="swh:origin" />
+            </xsd:sequence>
+          </xsd:complexType>
+        </xsd:element>
 
-            <!-- metadata-only deposit -->
-            <xsd:element name="reference">
-              <xsd:complexType>
-                <xsd:choice>
-                  <xsd:element ref="swh:origin" />
-                  <xsd:element ref="swh:object" />
-                </xsd:choice>
-              </xsd:complexType>
-            </xsd:element>
+        <!-- code deposit on an origin already created by a previous deposit -->
+        <xsd:element name="add_to_origin" minOccurs="0">
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element ref="swh:origin" />
+            </xsd:sequence>
+          </xsd:complexType>
+        </xsd:element>
 
-          </xsd:choice>
-        </xsd:complexType>
+        <!-- metadata-only deposit -->
+        <xsd:element name="reference" minOccurs="0">
+          <xsd:complexType>
+            <xsd:choice>
+              <xsd:element ref="swh:origin" />
+              <xsd:element ref="swh:object" />
+            </xsd:choice>
+          </xsd:complexType>
+        </xsd:element>
 
-        <xsd:element name="metadata-provenance" minOccurs="0" maxOccurs="1" >
-          <xsd:any />
+        <xsd:element name="metadata-provenance" minOccurs="0">
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:any minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+            </xsd:sequence>
+          </xsd:complexType>
         </xsd:element>
 
-      </xsd:sequence>
+      </xsd:all>
     </xsd:complexType>
   </xsd:element>
 
   <!-- references a SWHID -->
   <xsd:element name="object">
     <xsd:complexType>
-    <xsd:attribute type="xsd:string" name="swhid"/>
+      <xsd:attribute type="xsd:string" name="swhid"/>
     </xsd:complexType>
   </xsd:element>
 
   <!-- references an origin by URL -->
   <xsd:element name="origin">
     <xsd:complexType>
       <xsd:attribute type="xsd:string" name="url"/>
     </xsd:complexType>
   </xsd:element>
 </xsd:schema>