diff --git a/xml/Makefile.am b/xml/Makefile.am
index a27533e7e2..4a7381b097 100644
--- a/xml/Makefile.am
+++ b/xml/Makefile.am
@@ -1,41 +1,41 @@
 #
 # Copyright (C) 2004 Andrew Beekhof
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES    = Makefile.in
 
 
 dtddir			= $(CRM_DTD_DIRECTORY)
 
 VERSIONED_RNG_FILES	= pacemaker.rng constraints.rng resources.rng 
 
 RNG_FILES		= $(VERSIONED_RNG_FILES:%.rng=%-1.0.rng)	\
 			  $(VERSIONED_RNG_FILES:%.rng=%-1.1.rng)	\
 			  $(VERSIONED_RNG_FILES:%.rng=%-1.2.rng)	\
 			  pacemaker.rng versions.rng score.rng rule.rng nvset.rng \
-			  acls-1.1.rng acls-1.2.rng
+			  acls-1.1.rng acls-1.2.rng fencing.rng
 
 EXTRA_DIST		= crm-1.0.dtd $(dtd_SCRIPTS)
 dtd_SCRIPTS		= crm.dtd $(RNG_FILES) upgrade06.xsl crm-transitional.dtd
 
 crm.dtd: crm-1.0.dtd
 	cp $(top_srcdir)/xml/crm-1.0.dtd crm.dtd
 
 pacemaker.rng: pacemaker-$(CRM_DTD_VERSION).rng
 	cp $(top_builddir)/xml/$< $@
 
 clean:
 	rm -f crm.dtd pacemaker.rng
diff --git a/xml/fencing.rng b/xml/fencing.rng
new file mode 100644
index 0000000000..91f1addc4d
--- /dev/null
+++ b/xml/fencing.rng
@@ -0,0 +1,29 @@
+<?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="element-stonith"/>
+  </start>
+
+  <define name="element-stonith">
+    <element name="fencing-topology">
+      <zeroOrMore>
+	<ref name="element-level"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  
+  <define name="element-level">
+    <element name="fencing-level">
+      <attribute name="id"><data type="ID"/></attribute>
+      <attribute name="target"><text/></attribute>
+      <attribute name="index"><data type="positiveInteger"/></attribute>
+      <attribute name="devices">
+	<data type="string">
+          <param name="pattern">([a-zA-Z0-9_.-]+)(,[a-zA-Z0-9_.-]+)*</param>
+	</data>
+      </attribute>
+    </element>
+  </define>
+
+</grammar>
diff --git a/xml/pacemaker-1.1.rng b/xml/pacemaker-1.1.rng
index 744d51da00..fe4c55d6d6 100644
--- a/xml/pacemaker-1.1.rng
+++ b/xml/pacemaker-1.1.rng
@@ -1,156 +1,159 @@
 <?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>
 	  <externalRef href="acls-1.1.rng"/>
 	</optional>
+	<optional>
+	  <externalRef href="fencing.rng"/>
+	</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>
     <optional>
       <attribute name="update-origin"><text/></attribute>
     </optional>
     <optional>
       <attribute name="update-client"><text/></attribute>
     </optional>
     <optional>
       <attribute name="update-user"><text/></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>
 
 </grammar>