diff --git a/xml/pacemaker-1.1.rng b/xml/pacemaker-1.1.rng
index 79a50f379d..5ea2efd6c1 100644
--- a/xml/pacemaker-1.1.rng
+++ b/xml/pacemaker-1.1.rng
@@ -1,144 +1,201 @@
 <?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.rng"/>
 	    </element>
 	  </zeroOrMore>
 	</element>
 	<optional>
 	  <element name="rsc_defaults">
 	    <zeroOrMore>
 	      <element name="meta_attributes">
 		<externalRef href="nvset.rng"/>
 	      </element>
 	    </zeroOrMore>
 	  </element>
 	</optional>
 	<optional>
 	  <element name="op_defaults">
 	    <zeroOrMore>
 	      <element name="meta_attributes">
 		<externalRef href="nvset.rng"/>
 	      </element>
 	    </zeroOrMore>
 	  </element>
 	</optional>
 	<ref name="element-nodes"/>
 	<element name="resources">
 	  <externalRef href="resources-1.1.rng"/>
 	</element>
 	<optional>
 	  <element name="domains">
 	    <zeroOrMore>
 	      <element name="domain">
 		<attribute name="id"><data type="ID"/></attribute>
 		<zeroOrMore>
 		  <element name="node">
 		    <attribute name="name"><text/></attribute>
 		    <externalRef href="score.rng"/>
 		  </element>
 		</zeroOrMore>
 	      </element>
 	    </zeroOrMore>
 	  </element>
 	</optional>
 	<element name="constraints">
 	  <externalRef href="constraints-1.1.rng"/>
 	</element>
+	<optional>
+	  <ref name="element-acls"/>
+	</optional>
       </interleave>
     </element>
     <element name="status">
       <ref name="element-status"/>
     </element>
   </define>
 
   <define name="attribute-options">
     <externalRef href="versions.rng"/>
     <optional>
       <attribute name="crm_feature_set"><text/></attribute>
     </optional>
     <optional>
       <attribute name="remote-tls-port"><data type="nonNegativeInteger"/></attribute>
     </optional>
     <optional>
       <attribute name="remote-clear-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-last-written"><text/></attribute>
     </optional>
     <optional>
       <attribute name="no-quorum-panic"><data type="boolean"/></attribute>
     </optional>
   </define>
 
   <define name="element-nodes">
     <element name="nodes">
       <zeroOrMore>
 	<element name="node">
 	  <attribute name="id"><text/></attribute>
 	  <attribute name="uname"><text/></attribute>
 	  <attribute name="type">
 	    <choice>
 	      <value>normal</value>
 	      <value>member</value>
 	      <value>ping</value>
 	    </choice>
 	  </attribute>
 	  <optional>
 	    <attribute name="description"><text/></attribute>
 	  </optional>
 	  <optional>
 	    <externalRef href="score.rng"/>
 	  </optional>
 	  <zeroOrMore>
 	    <choice>
 	      <element name="instance_attributes">
 	        <externalRef href="nvset.rng"/>
 	      </element>
 	      <element name="utilization">
 	        <externalRef href="nvset.rng"/>
 	      </element>
 	    </choice>
 	  </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>
 
+  <define name="element-acls">
+    <element name="acls">
+      <zeroOrMore>
+	<choice>
+	  <element name="acl_user">
+	    <attribute name="id"><text/></attribute>
+	    <choice>
+	      <attribute name="role-ref"><data type="IDREF"/></attribute>
+	      <zeroOrMore>
+		<ref name="element-acl"/>
+	      </zeroOrMore>
+	    </choice>
+	  </element>
+	  <element name="acl_role">
+	    <attribute name="id"><data type="ID"/></attribute>
+	    <zeroOrMore>
+	      <ref name="element-acl"/>
+	    </zeroOrMore>
+	  </element>
+	</choice>
+      </zeroOrMore>
+    </element>
+  </define>
+
+  <define name="element-acl">
+    <choice>
+      <element name="read">
+	<ref name="attribute-acl"/>
+      </element>
+      <element name="write">
+	<ref name="attribute-acl"/>
+      </element>
+      <element name="deny">
+	<ref name="attribute-acl"/>
+      </element>
+    </choice>
+  </define>
+
+  <define name="attribute-acl">
+    <attribute name="id"><data type="ID"/></attribute>
+      <choice>
+	<attribute name="tag"><text/></attribute>
+	<attribute name="ref"><data type="IDREF"/></attribute>
+	<group>
+	  <attribute name="tag"><text/></attribute>
+	  <attribute name="ref"><data type="IDREF"/></attribute>
+	</group>
+	<attribute name="xpath"><text/></attribute>
+      </choice>
+      <optional>
+	<attribute name="attribute"><text/></attribute>
+      </optional>
+  </define>
+
 </grammar>
diff --git a/xml/pacemaker-1.2.rng b/xml/pacemaker-1.2.rng
index b45701a402..d2f7d57db1 100644
--- a/xml/pacemaker-1.2.rng
+++ b/xml/pacemaker-1.2.rng
@@ -1,183 +1,126 @@
 <?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.rng"/>
 	    </element>
 	  </zeroOrMore>
 	</element>
 	<optional>
 	  <element name="rsc_defaults">
 	    <zeroOrMore>
 	      <element name="meta_attributes">
 		<externalRef href="nvset.rng"/>
 	      </element>
 	    </zeroOrMore>
 	  </element>
 	</optional>
 	<optional>
 	  <element name="op_defaults">
 	    <zeroOrMore>
 	      <element name="meta_attributes">
 		<externalRef href="nvset.rng"/>
 	      </element>
 	    </zeroOrMore>
 	  </element>
 	</optional>
 	<ref name="element-nodes"/>
 	<element name="resources">
 	  <externalRef href="resources-1.2.rng"/>
 	</element>
 	<element name="constraints">
 	  <externalRef href="constraints-1.2.rng"/>
 	</element>
-	<optional>
-	  <ref name="element-acls"/>
-	</optional>
       </interleave>
     </element>
     <element name="status">
       <ref name="element-status"/>
     </element>
   </define>
 
   <define name="attribute-options">
     <externalRef href="versions.rng"/>
     <optional>
       <attribute name="crm_feature_set"><text/></attribute>
     </optional>
     <optional>
       <attribute name="remote-tls-port"><data type="nonNegativeInteger"/></attribute>
     </optional>
     <optional>
       <attribute name="remote-clear-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-last-written"><text/></attribute>
     </optional>
     <optional>
       <attribute name="no-quorum-panic"><data type="boolean"/></attribute>
     </optional>
   </define>
 
   <define name="element-nodes">
     <element name="nodes">
       <zeroOrMore>
 	<element name="node">
 	  <attribute name="id"><text/></attribute>
 	  <attribute name="uname"><text/></attribute>
 	  <attribute name="type">
 	    <choice>
 	      <value>normal</value>
 	      <value>member</value>
 	      <value>ping</value>
 	    </choice>
 	  </attribute>
 	  <optional>
 	    <attribute name="description"><text/></attribute>
 	  </optional>
 	  <zeroOrMore>
 	    <choice>
 	      <element name="instance_attributes">
 	        <externalRef href="nvset.rng"/>
 	      </element>
 	      <element name="utilization">
 	        <externalRef href="nvset.rng"/>
 	      </element>
 	    </choice>
 	  </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>
 
-  <define name="element-acls">
-    <element name="acls">
-      <zeroOrMore>
-	<choice>
-	  <element name="acl_user">
-	    <attribute name="id"><text/></attribute>
-	    <choice>
-	      <attribute name="role-ref"><data type="IDREF"/></attribute>
-	      <zeroOrMore>
-		<ref name="element-acl"/>
-	      </zeroOrMore>
-	    </choice>
-	  </element>
-	  <element name="acl_role">
-	    <attribute name="id"><data type="ID"/></attribute>
-	    <zeroOrMore>
-	      <ref name="element-acl"/>
-	    </zeroOrMore>
-	  </element>
-	</choice>
-      </zeroOrMore>
-    </element>
-  </define>
-
-  <define name="element-acl">
-    <choice>
-      <element name="read">
-	<ref name="attribute-acl"/>
-      </element>
-      <element name="write">
-	<ref name="attribute-acl"/>
-      </element>
-      <element name="deny">
-	<ref name="attribute-acl"/>
-      </element>
-    </choice>
-  </define>
-
-  <define name="attribute-acl">
-    <attribute name="id"><data type="ID"/></attribute>
-      <choice>
-	<attribute name="tag"><text/></attribute>
-	<attribute name="ref"><data type="IDREF"/></attribute>
-	<group>
-	  <attribute name="tag"><text/></attribute>
-	  <attribute name="ref"><data type="IDREF"/></attribute>
-	</group>
-	<attribute name="xpath"><text/></attribute>
-      </choice>
-      <optional>
-	<attribute name="attribute"><text/></attribute>
-      </optional>
-  </define>
-
 </grammar>