diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng
index cf0be68c27c3d39f900f3140fb628e1843f3a3fa..114b87e261f48cd222a6375a6174e0007e892476 100644
--- a/docs/schemas/domain.rng
+++ b/docs/schemas/domain.rng
@@ -1,9 +1,21 @@
 <?xml version="1.0"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <!-- We handle only document defining a domain -->
+  <!-- Grammar for accepting a domain element, both as top level, and
+       also suitable for inclusion in domainsnapshot.rng -->
   <start>
     <ref name="domain"/>
   </start>
 
   <include href='domaincommon.rng'/>
+
+  <define name='storageStartupPolicy' combine='choice'>
+    <!-- overrides the no-op version in storagecommon.rng -->
+    <ref name='startupPolicy'/>
+  </define>
+
+  <define name='storageSourceExtra' combine='choice'>
+    <!-- overrides the no-op version in storagecommon.rng -->
+    <ref name='diskspec'/>
+  </define>
+
 </grammar>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 59f3fdd525fef52edae66f0bfb23a52c0a84814b..df2c839e340abaf14f7e3de0e6838dfba65e337d 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1213,7 +1213,7 @@
                     </attribute>
                   </optional>
                   <optional>
-                    <ref name="startupPolicy"/>
+                    <ref name="storageStartupPolicy"/>
                   </optional>
                   <optional>
                     <ref name='devSeclabel'/>
@@ -1235,7 +1235,7 @@
                     </attribute>
                   </optional>
                   <optional>
-                    <ref name="startupPolicy"/>
+                    <ref name="storageStartupPolicy"/>
                   </optional>
                   <optional>
                     <ref name='devSeclabel'/>
@@ -1255,7 +1255,7 @@
                     <ref name="absFilePath"/>
                   </attribute>
                   <optional>
-                    <ref name="startupPolicy"/>
+                    <ref name="storageStartupPolicy"/>
                   </optional>
                   <empty/>
                 </element>
@@ -1296,7 +1296,7 @@
                     </attribute>
                   </optional>
                   <optional>
-                    <ref name="startupPolicy"/>
+                    <ref name="storageStartupPolicy"/>
                   </optional>
                   <optional>
                     <ref name='devSeclabel'/>
@@ -1306,10 +1306,11 @@
             </interleave>
           </group>
         </choice>
-        <ref name="diskspec"/>
+        <ref name="storageSourceExtra"/>
       </interleave>
     </element>
   </define>
+
   <define name="diskSourceNetwork">
     <attribute name="protocol">
       <choice>
diff --git a/docs/schemas/domainsnapshot.rng b/docs/schemas/domainsnapshot.rng
index 644da90f9c33a2c66be2d95c1b645cd2234c35c6..bec12dbe24a14178d1a814f08e5a7147bca1e5fe 100644
--- a/docs/schemas/domainsnapshot.rng
+++ b/docs/schemas/domainsnapshot.rng
@@ -75,7 +75,12 @@
                 <ref name="UUID"/>
               </element>
             </element>
-            <ref name='domain'/>
+            <!-- Nested grammar ensures that any of our overrides of
+                 storagecommon/domaincommon defines do not conflict
+                 with any domain.rng overrides.  -->
+            <grammar>
+              <include href='domain.rng'/>
+            </grammar>
           </choice>
         </optional>
         <optional>
@@ -102,6 +107,11 @@
     </choice>
   </define>
 
+  <define name='storageSourceExtra' combine='choice'>
+    <!-- overrides the no-op version in storagecommon.rng -->
+    <ref name='disksnapshotdriver'/>
+  </define>
+
   <define name='disksnapshot'>
     <element name='disk'>
       <attribute name='name'>
@@ -138,10 +148,13 @@
                         <ref name='absFilePath'/>
                       </attribute>
                     </optional>
+                    <optional>
+                      <ref name='storageStartupPolicy'/>
+                    </optional>
                     <empty/>
                   </element>
                 </optional>
-                <ref name='disksnapshotdriver'/>
+                <ref name='storageSourceExtra'/>
               </interleave>
             </group>
             <group>
@@ -157,7 +170,7 @@
                     <empty/>
                   </element>
                 </optional>
-                <ref name='disksnapshotdriver'/>
+                <ref name='storageSourceExtra'/>
               </interleave>
             </group>
             <group>
@@ -170,7 +183,7 @@
                     <ref name='diskSourceNetwork'/>
                   </element>
                 </optional>
-                <ref name='disksnapshotdriver'/>
+                <ref name='storageSourceExtra'/>
               </interleave>
             </group>
           </choice>
diff --git a/docs/schemas/storagecommon.rng b/docs/schemas/storagecommon.rng
index 1015e8d33427b098751c5c0920e0f5b0ac98bec0..06b2f81fde59d97f410d830689c426c5b297442c 100644
--- a/docs/schemas/storagecommon.rng
+++ b/docs/schemas/storagecommon.rng
@@ -79,4 +79,18 @@
     </choice>
   </define>
 
+  <define name='storageStartupPolicy'>
+    <!-- Use a combine='choice' override in client files that want to
+         add additional attributes to a <source> sub-element
+         associated with a storage source -->
+    <notAllowed/>
+  </define>
+
+  <define name='storageSourceExtra'>
+    <!-- Use a combine='choice' override in client files that want to
+         add additional elements as siblings of a <source> sub-element
+         associated with a storage source -->
+    <notAllowed/>
+  </define>
+
 </grammar>
diff --git a/tests/domainsnapshotxml2xmlin/disk-invalid.xml b/tests/domainsnapshotxml2xmlin/disk-invalid.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6d2bea4b971237113105134a8f306f965686e39c
--- /dev/null
+++ b/tests/domainsnapshotxml2xmlin/disk-invalid.xml
@@ -0,0 +1,10 @@
+<domainsnapshot>
+  <name>asdf</name>
+  <description>adsf</description>
+  <disks>
+    <disk name='vda' snapshot='external'>
+      <source file='/tmp/foo' startupPolicy='optional'/>
+      <driver/>
+    </disk>
+  </disks>
+</domainsnapshot>