diff --git a/xml/pacemaker.rng.in b/xml/pacemaker.rng.in
index f0e43f831f..a7a60d0790 100644
--- a/xml/pacemaker.rng.in
+++ b/xml/pacemaker.rng.in
@@ -1,113 +1,131 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- types: http://www.w3.org/TR/xmlschema-2/#dateTime -->
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" 
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
     <element name="cib">
       <ref name="element-cib"/>
     </element>
   </start>
 
   <define name="element-cib">
     <ref name="attribute-options"/>
     <element name="configuration">
       <interleave>
 	<element name="crm_config">
 	  <zeroOrMore>
 	    <element name="cluster_property_set">
 	      <externalRef href="nvset-@DTD_VERSION@.rng"/>
 	    </element>
 	  </zeroOrMore>
 	</element>
+	<optional>
+	  <element name="rsc_defaults">
+	    <zeroOrMore>
+	      <element name="meta_attributes">
+		<externalRef href="nvset-@DTD_VERSION@.rng"/>
+	      </element>
+	    </zeroOrMore>
+	  </element>
+	</optional>
+	<optional>
+	  <element name="op_defaults">
+	    <zeroOrMore>
+	      <element name="meta_attributes">
+		<externalRef href="nvset-@DTD_VERSION@.rng"/>
+	      </element>
+	    </zeroOrMore>
+	  </element>
+	</optional>
 	<ref name="element-nodes"/>
 	<element name="resources">
 	  <externalRef href="resources-@DTD_VERSION@.rng"/>
 	</element>
 	<element name="constraints">
 	  <externalRef href="constraints-@DTD_VERSION@.rng"/>
 	</element>
       </interleave>
     </element>
     <element name="status">
       <ref name="element-status"/>
     </element>
   </define>
 
   <define name="attribute-options">
     <attribute name="validate-with">
       <choice>
 	<value>none</value>
 	<value>dtd</value>
 	<value>relax-ng</value>
 	<value>relax-ng-1.0</value>
       </choice>
     </attribute>
     <attribute name="admin-epoch"><data type="nonNegativeInteger"/></attribute>
     <attribute name="epoch"><data type="nonNegativeInteger"/></attribute>
     <attribute name="num-updates"><data type="nonNegativeInteger"/></attribute>
     <optional>
       <attribute name="num-peers"><data type="integer"/></attribute>
     </optional>
     <optional>
       <attribute name="remote-access-port"><data type="nonNegativeInteger"/></attribute>
     </optional>
     <optional>
       <attribute name="have-quorum"><data type="boolean"/></attribute>
     </optional>
     <optional>
       <attribute name="dc-uuid"><text/></attribute>
     </optional>
     <optional>
       <attribute name="cib-feature-revision"><text/></attribute>
     </optional>
     <optional>
       <attribute name="crm-feature-set"><text/></attribute>
     </optional>
     <optional>
       <attribute name="cib-last-written"><text/></attribute>
     </optional>
   </define>
 
   <define name="element-nodes">
     <element name="nodes">
       <zeroOrMore>
 	<element name="node">
 	  <attribute name="id"><text/></attribute>
 	  <attribute name="uname"><data type="ID"/></attribute>
 	  <attribute name="type">
 	    <choice>
 	      <value>normal</value>
 	      <value>member</value>
 	      <value>ping</value>
 	    </choice>
 	  </attribute>
 	  <optional>
 	    <attribute name="description"><text/></attribute>
 	  </optional>
 	  <zeroOrMore>
 	    <element name="instance_attributes">
 	      <externalRef href="nvset-@DTD_VERSION@.rng"/>
 	    </element>
 	  </zeroOrMore>
 	</element>
       </zeroOrMore>
     </element>
   </define>
 
   <define name="element-status">
     <zeroOrMore>
       <choice>
         <attribute>
           <anyName/>
           <text/>
         </attribute>
         <element>
           <anyName/>
           <ref name="element-status"/>
         </element>
         <text/>
       </choice>
     </zeroOrMore>
   </define>
 
 </grammar>