diff --git a/checkstyle/src/plugin-resources/checkstyle.xsl b/checkstyle/src/plugin-resources/checkstyle.xsl
index 03a661eb..a83d2f25 100644
--- a/checkstyle/src/plugin-resources/checkstyle.xsl
+++ b/checkstyle/src/plugin-resources/checkstyle.xsl
@@ -71,32 +71,47 @@
           </table>
         </section>
 
-        <section name="Checkstyle Error Summary">
-
-          <table>
-            <tr>
-              <th>Error</th>
-              <th>Count</th>
-            </tr>
-            <xsl:for-each select="//error" >
-              <xsl:variable name="tmp" >
-                <xsl:value-of select="./@message" />
-              </xsl:variable>
-              <xsl:if test="generate-id(.) = generate-id(key('stvalkey',$tmp)[1])">
-                <tr>
-                  <td><xsl:value-of select="$tmp" /></td>
-                  <td><xsl:value-of select="count(key('stvalkey',$tmp))" /></td>
-                </tr>
-              </xsl:if>       
-            </xsl:for-each>
-          </table>
-
-        </section>
+        <xsl:apply-templates select="." mode="count">
+          <xsl:with-param name="severity">error</xsl:with-param>
+        </xsl:apply-templates>
+        <xsl:apply-templates select="." mode="count">
+          <xsl:with-param name="severity">warning</xsl:with-param>
+        </xsl:apply-templates>
+        <xsl:apply-templates select="." mode="count">
+          <xsl:with-param name="severity">info</xsl:with-param>
+        </xsl:apply-templates>
 
       </body>
     </document>
   </xsl:template>
 
+  <xsl:template match="/" mode="count">
+      <xsl:param name="severity"/>
+
+      <xsl:element name="section">
+        <xsl:attribute name="name">Checkstyle <xsl:value-of select="$severity"/> Summary</xsl:attribute>
+
+        <table>
+          <tr>
+            <th>Error</th>
+            <th>Count</th>
+          </tr>
+          <xsl:for-each select="//error[@severity=$severity]" >
+            <xsl:variable name="tmp" >
+              <xsl:value-of select="./@message" />
+            </xsl:variable>
+            <xsl:if test="generate-id(.) = generate-id(key('stvalkey',$tmp)[1])">
+              <tr>
+                <td><xsl:value-of select="$tmp" /></td>
+                <td><xsl:value-of select="count(key('stvalkey',$tmp))" /></td>
+              </tr>
+            </xsl:if>       
+          </xsl:for-each>
+        </table>
+
+        </xsl:element>
+  </xsl:template>
+
   <xsl:template match="text()" />
 
 </xsl:stylesheet>