diff --git a/xml/nvset-3.9.rng b/xml/nvset-3.9.rng
index 09d2be0c42..96383bcfe1 100644
--- a/xml/nvset-3.9.rng
+++ b/xml/nvset-3.9.rng
@@ -1,63 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- just as nvset-2.9.rng, but allows for instantiated @name restrictions -->
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" 
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
     <ref name="element-nvset"/>
   </start>
 
   <!-- nvpair/@name:
        * generic string by default, parent grammar may want to prohibit
          enumerated names -->
   <define name="element-nvset.name">
     <attribute name="name">
       <text/>
     </attribute>
   </define>
 
   <!-- nvpair/@name:
        * defer element-nvset.name grammar item
        nvpair/@value:
        generic string by default, parent grammar may want to restrict
        enumerated pairs (i.e. related to @name) at once -->
   <define name="element-nvset.name-value">
     <ref name="element-nvset.name"/>
     <optional>
       <attribute name="value"><text/></attribute>
     </optional>
   </define>
 
+  <!-- Allow easy redefinition in parent grammars -->
+  <define name="element-nvset.rule">
+    <externalRef href="rule-3.9.rng"/>
+  </define>
+
   <define name="element-nvset">
    <choice>
    <attribute name="id-ref"><data type="IDREF"/></attribute>
    <group>
     <attribute name="id"><data type="ID"/></attribute>
     <interleave>
       <optional>
-        <externalRef href="rule-3.9.rng"/>
+        <ref name="element-nvset.rule"/>
       </optional>
         <zeroOrMore>
           <element name="nvpair">
             <choice>
               <group>
                 <attribute name="id-ref"><data type="IDREF"/></attribute>
                 <optional>
                   <attribute name="name"><text/></attribute>
                 </optional>
               </group>
               <group>
                 <attribute name="id"><data type="ID"/></attribute>
                 <ref name="element-nvset.name-value"/>
               </group>
             </choice>
           </element>
         </zeroOrMore>
       <optional>
         <externalRef href="score.rng"/>
       </optional>
     </interleave>
    </group>
    </choice>
   </define>
 
 </grammar>
diff --git a/xml/options-3.9.rng b/xml/options-3.9.rng
index 18620ebe6f..de179ecaef 100644
--- a/xml/options-3.9.rng
+++ b/xml/options-3.9.rng
@@ -1,111 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
     <ref name="options"/>
   </start>
 
+  <!--
+   Include rule definitions so that we can override element-nvset.rule based on
+   context
+   -->
+  <include href="rule-3.9.rng">
+    <start combine="choice">
+      <notAllowed/>
+    </start>
+  </include>
+
   <!--
    see upgrade-2.10.xsl
    - cibtr:table for="cluster-properties"
    -->
   <define name="cluster_property_set.nvpair.name-value-unsupported">
     <choice>
       <group>
         <attribute name="name">
           <value type="string">cluster-infrastructure</value>
         </attribute>
         <attribute name="value">
           <data type="string">
             <except>
               <choice>
                 <value>heartbeat</value>
                 <value>openais</value>
                 <value>classic openais</value>
                 <value>classic openais (with plugin)</value>
                 <value>cman</value>
               </choice>
             </except>
           </data>
         </attribute>
       </group>
       <group>
         <attribute name="name">
           <data type="string">
             <except>
               <choice>
                 <value>cluster-infrastructure</value>
                 <value>cluster_recheck_interval</value>
                 <value>dc_deadtime</value>
                 <value>default-action-timeout</value>
                 <value>default_action_timeout</value>
                 <value>default-migration-threshold</value>
                 <value>default_migration_threshold</value>
                 <value>default-resource-failure-stickiness</value>
                 <value>default_resource_failure_stickiness</value>
                 <value>default-resource-stickiness</value>
                 <value>default_resource_stickiness</value>
                 <value>election_timeout</value>
                 <value>expected-quorum-votes</value>
                 <value>is-managed-default</value>
                 <value>is_managed_default</value>
                 <value>no_quorum_policy</value>
                 <value>notification-agent</value>
                 <value>notification-recipient</value>
                 <value>remove_after_stop</value>
                 <value>shutdown_escalation</value>
                 <value>startup_fencing</value>
                 <value>stonith_action</value>
                 <value>stonith_enabled</value>
                 <value>stop_orphan_actions</value>
                 <value>stop_orphan_resources</value>
                 <value>symmetric_cluster</value>
                 <value>transition_idle_timeout</value>
               </choice>
             </except>
           </data>
         </attribute>
         <optional>
           <attribute name="value"><text/></attribute>
         </optional>
       </group>
     </choice>
   </define>
 
   <define name="options">
     <interleave>
       <element name="crm_config">
         <zeroOrMore>
           <element name="cluster_property_set">
             <grammar>
               <include href="nvset-3.9.rng">
                 <define name="element-nvset.name-value">
                   <parentRef name="cluster_property_set.nvpair.name-value-unsupported"/>
                 </define>
               </include>
             </grammar>
           </element>
         </zeroOrMore>
       </element>
       <optional>
         <element name="rsc_defaults">
           <zeroOrMore>
             <element name="meta_attributes">
-              <externalRef href="nvset-3.9.rng"/>
+              <grammar>
+                <include href="nvset-3.9.rng">
+                  <define name="element-nvset.rule">
+                    <parentRef name="element-rule-rsc_defaults"/>
+                  </define>
+                </include>
+              </grammar>
             </element>
           </zeroOrMore>
         </element>
       </optional>
       <optional>
         <element name="op_defaults">
           <zeroOrMore>
             <element name="meta_attributes">
               <externalRef href="nvset-3.9.rng"/>
             </element>
           </zeroOrMore>
         </element>
       </optional>
     </interleave>
   </define>
 
 </grammar>