diff --git a/rgmanager/src/resources/ra2rng.xsl b/rgmanager/src/resources/ra2rng.xsl
index 11782d79b..e53595ef8 100644
--- a/rgmanager/src/resources/ra2rng.xsl
+++ b/rgmanager/src/resources/ra2rng.xsl
@@ -1,54 +1,330 @@
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<xsl:output method="text" indent="yes"/>
+<xsl:stylesheet version="1.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:int="__internal__"
+    exclude-result-prefixes="int">
+    <xsl:output method="text" indent="no"/>
+
+<xsl:param name="init-indent" select="'  '"/>
+<xsl:param name="indent" select="'  '"/>
+
+
+<!--
+  helpers
+  -->
+
+<int:common-optional-parameters>
+    <int:parameter name="__independent_subtree">
+        <int:shortdesc>
+            Treat this and all children as an independent subtree.
+        </int:shortdesc>
+    </int:parameter>
+    <int:parameter name="__enforce_timeouts">
+        <int:shortdesc>
+            Consider a timeout for operations as fatal.
+        </int:shortdesc>
+    </int:parameter>
+    <int:parameter name="__max_failures">
+        <int:shortdesc>
+            Maximum number of failures before returning a failure to
+            a status check.
+        </int:shortdesc>
+    </int:parameter>
+    <int:parameter name="__failure_expire_time">
+        <int:shortdesc>
+            Amount of time before a failure is forgotten.
+        </int:shortdesc>
+    </int:parameter>
+    <int:parameter name="__max_restarts">
+        <int:shortdesc>
+            Maximum number restarts for an independent subtree before
+            giving up.
+        </int:shortdesc>
+    </int:parameter>
+    <int:parameter name="__restart_expire_time">
+        <int:shortdesc>
+            Amount of time before a failure is forgotten for
+            an independent subtree.
+        </int:shortdesc>
+    </int:parameter>
+</int:common-optional-parameters>
+
+<xsl:variable name="SP" select="' '"/>
+<xsl:variable name="NL" select="'&#xA;'"/>
+<xsl:variable name="NLNL" select="'&#xA;&#xA;'"/>
+<xsl:variable name="Q" select="'&quot;'"/>
+<xsl:variable name="TS" select="'&lt;'"/>
+<xsl:variable name="TSc" select="'&lt;/'"/>
+<xsl:variable name="TE" select="'&gt;'"/>
+<xsl:variable name="TEc" select="'/&gt;'"/>
+
+<xsl:template name="comment">
+    <xsl:param name="text" select="''"/>
+    <xsl:param name="indent" select="''"/>
+    <xsl:if test="$indent != 'none'">
+        <xsl:value-of select="concat($init-indent, $indent)"/>
+    </xsl:if>
+    <xsl:value-of select="concat($TS, '!-- ', $text, ' --',$TE)"/>
+</xsl:template>
+
+<xsl:template name="tag-start">
+    <xsl:param name="name"/>
+    <xsl:param name="attrs" select="''"/>
+    <xsl:param name="indent" select="''"/>
+    <xsl:if test="$indent != 'none'">
+        <xsl:value-of select="concat($init-indent, $indent)"/>
+    </xsl:if>
+    <xsl:value-of select="concat($TS, $name)"/>
+    <xsl:if test="$attrs != ''">
+        <xsl:value-of select="concat($SP, $attrs)"/>
+    </xsl:if>
+    <xsl:value-of select="$TE"/>
+</xsl:template>
+
+<xsl:template name="tag-end">
+    <xsl:param name="name"/>
+    <xsl:param name="attrs" select="''"/>
+    <xsl:param name="indent" select="''"/>
+    <xsl:if test="$indent != 'none'">
+        <xsl:value-of select="concat($init-indent, $indent)"/>
+    </xsl:if>
+    <xsl:value-of select="concat($TSc, $name)"/>
+    <xsl:if test="$attrs != ''">
+        <xsl:value-of select="concat($SP, $attrs)"/>
+    </xsl:if>
+    <xsl:value-of select="$TE"/>
+</xsl:template>
+
+<xsl:template name="tag-self">
+    <xsl:param name="name"/>
+    <xsl:param name="attrs" select="''"/>
+    <xsl:param name="indent" select="''"/>
+    <xsl:if test="$indent != 'none'">
+        <xsl:value-of select="concat($init-indent, $indent)"/>
+    </xsl:if>
+    <xsl:value-of select="concat($TS, $name)"/>
+    <xsl:if test="$attrs != ''">
+        <xsl:value-of select="concat($SP, $attrs)"/>
+    </xsl:if>
+    <xsl:value-of select="$TEc"/>
+</xsl:template>
+
 <xsl:template name="capitalize">
-	<xsl:param name="value"/>
-	<xsl:variable name="normalized" select="translate($value, '_abcdefghijklmnopqrstuvwrxyz', '-ABCDEFGHIJKLMNOPQRSTUVWRXYZ')"/>
-	<xsl:value-of select="$normalized"/>
+    <xsl:param name="value"/>
+    <xsl:value-of select="translate($value,
+                                    '_abcdefghijklmnopqrstuvwrxyz',
+                                    '-ABCDEFGHIJKLMNOPQRSTUVWRXYZ')"/>
 </xsl:template>
 
+
+<!--
+  proceed
+  -->
+
 <xsl:template match="/resource-agent">
-  &lt;define name="<xsl:call-template name="capitalize"><xsl:with-param name="value" select="@name"/></xsl:call-template>"&gt;
-    &lt;element name="<xsl:value-of select="@name"/>" rha:description="<xsl:value-of select="normalize-space(shortdesc)"/>"&gt;
-      &lt;choice&gt;
-      &lt;group&gt;
-        &lt;!-- rgmanager specific stuff --&gt;
-        &lt;attribute name="ref" rha:description="Reference to existing <xsl:value-of select="@name"/> resource in the resources section."/&gt;
-      &lt;/group&gt;
-      &lt;group&gt;<xsl:for-each select="parameters/parameter">
-		<xsl:choose>
-			<xsl:when test="@required = 1 or @primary = 1">
-        &lt;attribute name="<xsl:value-of select="@name"/>" rha:description="<xsl:value-of select="normalize-space(shortdesc)"/>"/&gt;</xsl:when>
-			<xsl:otherwise>
-        &lt;optional&gt;
-          &lt;attribute name="<xsl:value-of select="@name"/>" rha:description="<xsl:value-of select="normalize-space(shortdesc)"/>"/&gt;
-        &lt;/optional&gt;</xsl:otherwise>
-		</xsl:choose>
-	</xsl:for-each>
-      &lt;/group&gt;
-      &lt;/choice&gt;
-      &lt;optional&gt;
-        &lt;attribute name="__independent_subtree" rha:description="Treat this and all children as an independent subtree."/&gt;
-      &lt;/optional&gt;
-      &lt;optional&gt;
-        &lt;attribute name="__enforce_timeouts" rha:description="Consider a timeout for operations as fatal."/&gt;
-      &lt;/optional&gt;
-      &lt;optional&gt;
-        &lt;attribute name="__max_failures" rha:description="Maximum number of failures before returning a failure to a status check."/&gt;
-      &lt;/optional&gt;
-      &lt;optional&gt;
-        &lt;attribute name="__failure_expire_time" rha:description="Amount of time before a failure is forgotten."/&gt;
-      &lt;/optional&gt;
-      &lt;optional&gt;
-        &lt;attribute name="__max_restarts" rha:description="Maximum number restarts for an independent subtree before giving up."/&gt;
-      &lt;/optional&gt;
-      &lt;optional&gt;
-        &lt;attribute name="__restart_expire_time" rha:description="Amount of time before a failure is forgotten for an independent subtree."/&gt;
-      &lt;/optional&gt;
-      &lt;optional&gt;
-        &lt;ref name="CHILDREN"/&gt;
-      &lt;/optional&gt;
-    &lt;/element&gt;
-  &lt;/define&gt;
+    <xsl:value-of select="$NL"/>
+
+    <!-- define name=... (start) -->
+    <xsl:variable name="capitalized">
+        <xsl:call-template name="capitalize">
+            <xsl:with-param name="value" select="@name"/>
+        </xsl:call-template>
+    </xsl:variable>
+    <xsl:call-template name="tag-start">
+        <xsl:with-param name="name" select="'define'"/>
+        <xsl:with-param name="attrs" select="concat(
+            'name=', $Q, $capitalized, $Q)"/>
+    </xsl:call-template>
+    <xsl:value-of select="$NL"/>
+
+        <!-- element name=... rha:description=... (start) -->
+        <xsl:call-template name="tag-start">
+            <xsl:with-param name="name" select="'element'"/>
+            <xsl:with-param name="attrs" select="concat(
+                'name=',            $Q, @name,                      $Q, $SP,
+                'rha:description=', $Q, normalize-space(shortdesc), $Q)"/>
+            <xsl:with-param name="indent" select="$indent"/>
+        </xsl:call-template>
+        <xsl:value-of select="$NL"/>
+
+            <!-- choice (start) -->
+            <xsl:call-template name="tag-start">
+                <xsl:with-param name="name" select="'choice'"/>
+                <xsl:with-param name="indent" select="concat($indent, $indent)"/>
+            </xsl:call-template>
+            <xsl:value-of select="$NL"/>
+
+                <!-- group (start) -->
+                <xsl:call-template name="tag-start">
+                    <xsl:with-param name="name" select="'group'"/>
+                    <xsl:with-param name="indent" select="concat($indent, $indent,
+                                                                 $indent)"/>
+                </xsl:call-template>
+                <xsl:value-of select="$NL"/>
+
+                    <!-- (comment) -->
+                    <xsl:call-template name="comment">
+                        <xsl:with-param name="text">
+                            <xsl:text>rgmanager specific stuff</xsl:text>
+                        </xsl:with-param>
+                        <xsl:with-param name="indent" select="concat($indent, $indent,
+                                                                     $indent, $indent)"/>
+                    </xsl:call-template>
+                    <xsl:value-of select="$NL"/>
+
+                    <!-- attribute name="ref" -->
+                    <xsl:call-template name="tag-self">
+                        <xsl:with-param name="name" select="'attribute'"/>
+                        <xsl:with-param name="attrs" select="concat(
+                            'name=',            $Q, 'ref',                    $Q, $SP,
+                            'rha:description=', $Q, 'Reference to existing ',
+                                                    @name, ' resource in ',
+                                                    'the resources section.', $Q)"/>
+                        <xsl:with-param name="indent" select="concat($indent, $indent,
+                                                                     $indent, $indent)"/>
+                    </xsl:call-template>
+                    <xsl:value-of select="$NL"/>
+
+                <!-- group (end) -->
+                <xsl:call-template name="tag-end">
+                    <xsl:with-param name="name" select="'group'"/>
+                    <xsl:with-param name="indent" select="concat($indent, $indent,
+                                                                 $indent)"/>
+                </xsl:call-template>
+                <xsl:value-of select="$NL"/>
+
+                <!-- group (start) -->
+                <xsl:call-template name="tag-start">
+                    <xsl:with-param name="name" select="'group'"/>
+                    <xsl:with-param name="indent" select="concat($indent, $indent,
+                                                                 $indent)"/>
+                </xsl:call-template>
+                <xsl:value-of select="$NL"/>
+
+                <xsl:for-each select="parameters/parameter">
+                    <xsl:choose>
+                        <xsl:when test="@required = '1' or @primary = '1'">
+                            <!-- attribute name=... rha:description=... -->
+                            <xsl:call-template name="tag-self">
+                                <xsl:with-param name="name" select="'attribute'"/>
+                                <xsl:with-param name="attrs" select="concat(
+                                    'name=',            $Q, @name,                      $Q, $SP,
+                                    'rha:description=', $Q, normalize-space(shortdesc), $Q)"/>
+                                <xsl:with-param name="indent" select="concat($indent, $indent,
+                                                                             $indent, $indent)"/>
+                            </xsl:call-template>
+                            <xsl:value-of select="$NL"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <!-- optional (start) -->
+                            <xsl:call-template name="tag-start">
+                                <xsl:with-param name="name" select="'optional'"/>
+                                <xsl:with-param name="indent" select="concat($indent, $indent,
+                                                                             $indent, $indent)"/>
+                            </xsl:call-template>
+                            <xsl:value-of select="$NL"/>
+
+                                <!-- attribute name=... rha:description=... -->
+                                <xsl:call-template name="tag-self">
+                                    <xsl:with-param name="name" select="'attribute'"/>
+                                    <xsl:with-param name="attrs" select="concat(
+                                        'name=',            $Q, @name,                      $Q, $SP,
+                                        'rha:description=', $Q, normalize-space(shortdesc), $Q)"/>
+                                    <xsl:with-param name="indent" select="concat($indent, $indent,
+                                                                                 $indent, $indent,
+                                                                                 $indent)"/>
+                                </xsl:call-template>
+                                <xsl:value-of select="$NL"/>
+
+                            <!-- optional (end) -->
+                            <xsl:call-template name="tag-end">
+                                <xsl:with-param name="name" select="'optional'"/>
+                                <xsl:with-param name="indent" select="concat($indent, $indent,
+                                                                             $indent, $indent)"/>
+                            </xsl:call-template>
+                            <xsl:value-of select="$NL"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:for-each>
+
+                <!-- group (end) -->
+                <xsl:call-template name="tag-end">
+                    <xsl:with-param name="name" select="'group'"/>
+                    <xsl:with-param name="indent" select="concat($indent, $indent,
+                                                                 $indent)"/>
+                </xsl:call-template>
+                <xsl:value-of select="$NL"/>
+
+            <!-- choice (end) -->
+            <xsl:call-template name="tag-end">
+                <xsl:with-param name="name" select="'choice'"/>
+                <xsl:with-param name="indent" select="concat($indent, $indent)"/>
+            </xsl:call-template>
+            <xsl:value-of select="$NL"/>
+
+            <xsl:for-each select="document('')/*/int:common-optional-parameters/int:parameter">
+                <!-- optional (start) -->
+                <xsl:call-template name="tag-start">
+                    <xsl:with-param name="name" select="'optional'"/>
+                    <xsl:with-param name="indent" select="concat($indent, $indent)"/>
+                </xsl:call-template>
+                <xsl:value-of select="$NL"/>
+
+                    <!-- attribute name=... rha:description=... -->
+                    <xsl:call-template name="tag-self">
+                        <xsl:with-param name="name" select="'attribute'"/>
+                        <xsl:with-param name="attrs" select="concat(
+                            'name=',            $Q, @name,                          $Q, $SP,
+                            'rha:description=', $Q, normalize-space(int:shortdesc), $Q)"/>
+                        <xsl:with-param name="indent" select="concat($indent, $indent,
+                                                                     $indent)"/>
+                    </xsl:call-template>
+                    <xsl:value-of select="$NL"/>
+
+                <!-- optional (end) -->
+                <xsl:call-template name="tag-end">
+                    <xsl:with-param name="name" select="'optional'"/>
+                    <xsl:with-param name="indent" select="concat($indent, $indent)"/>
+                </xsl:call-template>
+                <xsl:value-of select="$NL"/>
+            </xsl:for-each>
+
+            <!-- optional (start) -->
+            <xsl:call-template name="tag-start">
+                <xsl:with-param name="name" select="'optional'"/>
+                <xsl:with-param name="indent" select="concat($indent, $indent)"/>
+            </xsl:call-template>
+            <xsl:value-of select="$NL"/>
+
+                <!-- ref name="CHILDREN" -->
+                <xsl:call-template name="tag-self">
+                    <xsl:with-param name="name" select="'ref'"/>
+                    <xsl:with-param name="attrs" select="concat(
+                        'name=', $Q, 'CHILDREN', $Q)"/>
+                    <xsl:with-param name="indent" select="concat($indent, $indent,
+                                                                 $indent)"/>
+                </xsl:call-template>
+                <xsl:value-of select="$NL"/>
+
+            <!-- optional (end) -->
+            <xsl:call-template name="tag-end">
+                <xsl:with-param name="name" select="'optional'"/>
+                <xsl:with-param name="indent" select="concat($indent, $indent)"/>
+            </xsl:call-template>
+            <xsl:value-of select="$NL"/>
+
+        <!-- element (end) -->
+        <xsl:call-template name="tag-end">
+            <xsl:with-param name="name" select="'element'"/>
+            <xsl:with-param name="indent" select="$indent"/>
+        </xsl:call-template>
+        <xsl:value-of select="$NL"/>
+
+    <!-- define (end) -->
+    <xsl:call-template name="tag-end">
+        <xsl:with-param name="name" select="'define'"/>
+    </xsl:call-template>
+    <xsl:value-of select="$NLNL"/>
 
 </xsl:template>
+
 </xsl:stylesheet>