diff --git a/dashboard/plugin.properties b/dashboard/plugin.properties
index b7ab248d..4bd51e77 100644
--- a/dashboard/plugin.properties
+++ b/dashboard/plugin.properties
@@ -78,6 +78,13 @@ maven.dashboard.rungoals = true
 # Default aggregators
 # -------------------
 
+# Properties for the Checkstyle files aggregator
+maven.dashboard.aggregator.csfiles.script = ${maven.dashboard.aggregators.dir}/csfiles.jelly
+maven.dashboard.aggregator.csfiles.artifact = ${maven.build.dir}/checkstyle-raw-report.xml
+maven.dashboard.aggregator.csfiles.label = CS Files
+maven.dashboard.aggregator.csfiles.goal = checkstyle
+maven.dashboard.aggregator.csfiles.description = Number of files checked with Checkstyle
+
 # Properties for the Checkstyle error/warning aggregator (all errors/warnings)
 maven.dashboard.aggregator.csall.script = ${maven.dashboard.aggregators.dir}/csall.jelly
 maven.dashboard.aggregator.csall.artifact = ${maven.build.dir}/checkstyle-raw-report.xml
@@ -148,6 +155,20 @@ maven.dashboard.aggregator.junitpassrate.label = JUnit Pass Rate
 maven.dashboard.aggregator.junitpassrate.goal = junit-report:report
 maven.dashboard.aggregator.junitpassrate.description = Percentage of JUnit tests that have passed vs tests in error or failed
 
+# Properties for the PMD violations aggregator 
+maven.dashboard.aggregator.pmdfiles.script = ${maven.dashboard.aggregators.dir}/pmdfiles.jelly
+maven.dashboard.aggregator.pmdfiles.artifact = ${maven.build.dir}/pmd-raw-report.xml
+maven.dashboard.aggregator.pmdfiles.label = PMD Files with Violations
+maven.dashboard.aggregator.pmdfiles.goal = pmd:report
+maven.dashboard.aggregator.pmdfiles.description = Number of files with PMD violations
+
+# Properties for the PMD violations aggregator 
+maven.dashboard.aggregator.pmdviolations.script = ${maven.dashboard.aggregators.dir}/pmdviolations.jelly
+maven.dashboard.aggregator.pmdviolations.artifact = ${maven.build.dir}/pmd-raw-report.xml
+maven.dashboard.aggregator.pmdviolations.label = PMD Violations
+maven.dashboard.aggregator.pmdviolations.goal = pmd:report
+maven.dashboard.aggregator.pmdviolations.description = Number of PMD violations
+
 # Properties for the Simian duplicate lines aggregator 
 maven.dashboard.aggregator.simiantdl.script = ${maven.dashboard.aggregators.dir}/simiantdl.jelly
 maven.dashboard.aggregator.simiantdl.artifact = ${maven.build.dir}/generated-xdocs/simian-report.xml
diff --git a/dashboard/project.xml b/dashboard/project.xml
index a0722864..d4073b8f 100644
--- a/dashboard/project.xml
+++ b/dashboard/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-dashboard-plugin</id>
   <name>Maven Dashboard Plugin</name>
-  <currentVersion>1.3</currentVersion>
+  <currentVersion>1.4-SNAPSHOT</currentVersion>
   <description>Generate a dashboard containing global statistics about other maven reports</description>
   <shortDescription>Generate a statistic dashboard</shortDescription>
   <url>http://maven.apache.org/reference/plugins/dashboard/</url>
@@ -75,6 +75,10 @@
       <name>John D Taylor</name>
       <email>jdt@roe.ac.uk</email>
     </contributor>
+    <contributor>
+      <name>Paul Spencer</name>
+      <email>paulsp@apache.org</email>
+    </contributor>
   </contributors>
   <dependencies/>
 </project>
diff --git a/dashboard/src/plugin-resources/aggregators/csfiles.jelly b/dashboard/src/plugin-resources/aggregators/csfiles.jelly
new file mode 100644
index 00000000..5447fed6
--- /dev/null
+++ b/dashboard/src/plugin-resources/aggregators/csfiles.jelly
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+
+<!-- 
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
+<!--
+   ========================================================================
+     Checkstyle aggregator. Extracts count of files checked with Checkstyle
+     raw XML file.
+   ========================================================================
+-->
+<j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:u="jelly:util">
+
+  <u:file var="artifactAsFile" 
+      name="${maven.dashboard.aggregator.csfiles.artifact}"/>
+  <j:choose>
+    <j:when test="${artifactAsFile.exists()}">
+      <x:parse var="doc" xml="${artifactAsFile}"/>
+      <x:expr select="count($doc//file)"/>
+    </j:when>
+    <j:otherwise>
+      <j:expr value="-"/>
+    </j:otherwise>
+  </j:choose>
+
+</j:jelly>
diff --git a/dashboard/src/plugin-resources/aggregators/pmdfiles.jelly b/dashboard/src/plugin-resources/aggregators/pmdfiles.jelly
new file mode 100644
index 00000000..a3f66eed
--- /dev/null
+++ b/dashboard/src/plugin-resources/aggregators/pmdfiles.jelly
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+
+<!-- 
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
+<!--
+   ========================================================================
+     PMD aggregator. Extracts count of files with violations from PMD raw 
+     XML file.
+   ========================================================================
+-->
+<j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:u="jelly:util">
+
+  <u:file var="artifactAsFile" 
+      name="${maven.dashboard.aggregator.pmdfiles.artifact}"/>
+  <j:choose>
+    <j:when test="${artifactAsFile.exists()}">
+      <x:parse var="doc" xml="${artifactAsFile}"/>
+      <x:expr select="count($doc//file)"/>
+    </j:when>
+    <j:otherwise>
+      <j:expr value="-"/>
+    </j:otherwise>
+  </j:choose>
+
+</j:jelly>
diff --git a/dashboard/src/plugin-resources/aggregators/pmdviolations.jelly b/dashboard/src/plugin-resources/aggregators/pmdviolations.jelly
new file mode 100644
index 00000000..78033af7
--- /dev/null
+++ b/dashboard/src/plugin-resources/aggregators/pmdviolations.jelly
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+
+<!-- 
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
+<!--
+   ========================================================================
+     PMD aggregator. Extracts violation count from PMD raw XML 
+     file.
+   ========================================================================
+-->
+<j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:u="jelly:util">
+
+  <u:file var="artifactAsFile" 
+      name="${maven.dashboard.aggregator.pmdviolations.artifact}"/>
+  <j:choose>
+    <j:when test="${artifactAsFile.exists()}">
+      <x:parse var="doc" xml="${artifactAsFile}"/>
+      <x:expr select="count($doc//violation)"/>
+    </j:when>
+    <j:otherwise>
+      <j:expr value="-"/>
+    </j:otherwise>
+  </j:choose>
+
+</j:jelly>
diff --git a/dashboard/src/plugin-test/project.properties b/dashboard/src/plugin-test/project.properties
index 197cff68..45c733e7 100644
--- a/dashboard/src/plugin-test/project.properties
+++ b/dashboard/src/plugin-test/project.properties
@@ -36,7 +36,7 @@ maven.dashboard.runreactor = false
 
 # Define what dashboard aggregators will be run. This property is inherited
 # by the subprojects and thus they don't need to define it again.
-maven.dashboard.aggregators = csall,cserrors,cswarnings,clovertpc,cloverloc,cloverncloc,junittests,junitpassrate,junitfailures,juniterrors,simiantdl
+maven.dashboard.aggregators = csall,cserrors,cswarnings,csfiles,clovertpc,cloverloc,cloverncloc,junittests,junitpassrate,junitfailures,juniterrors,simiantdl,pmdfiles,pmdviolations
 
 # Make sure that an XML report is generated whenever Clover is run. Also
 # inherited by the subprojects.
diff --git a/dashboard/xdocs/aggregators.xml b/dashboard/xdocs/aggregators.xml
index 74fa7ea4..67f14881 100644
--- a/dashboard/xdocs/aggregators.xml
+++ b/dashboard/xdocs/aggregators.xml
@@ -46,6 +46,13 @@
             Computes total number of Checkstyle warnings and errors.
           </td>
         </tr>
+        <tr>
+          <td>csfiles</td>
+          <td>Checkstyle</td>
+          <td>
+            Computes total number of files checked by Checkstyle.
+          </td>
+        </tr>
         <tr>
           <td>cserrors</td>
           <td>Checkstyle</td>
@@ -109,6 +116,20 @@
             Percentage of JUnit tests that have passed.
           </td>
         </tr>
+        <tr>
+          <td>pmdfiles</td>
+          <td>PMD</td>
+          <td>
+            Computes total number of files with PMD violations.
+          </td>
+        </tr>
+        <tr>
+          <td>pmdviolations</td>
+          <td>PMD</td>
+          <td>
+            Computes total number of PMD violations.
+          </td>
+        </tr>
         <tr>
           <td>simiantdl</td>
           <td>Simian</td>
diff --git a/dashboard/xdocs/changes.xml b/dashboard/xdocs/changes.xml
index dbbd8862..573c0ba2 100644
--- a/dashboard/xdocs/changes.xml
+++ b/dashboard/xdocs/changes.xml
@@ -24,6 +24,12 @@
     <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
   <body>
+    <release version="1.4-SNAPSHOT" date="in CVS">
+      <action dev="vmassol" type="add" issue="MPDASHBOARD-7" due-to="Paul Spencer">
+        Added new Checkstyle File aggregator and PMD aggregators (count of 
+        violations and count of files with violations).
+      </action>
+    </release>
     <release version="1.3" date="2004-05-15">
       <action dev="vmassol" type="update">Better error reporting when a wrong aggregator name is used.</action>
       <action dev="vmassol" type="add">Added Simian Total Duplicate Lines aggregator.</action>
diff --git a/dashboard/xdocs/properties.xml b/dashboard/xdocs/properties.xml
index 344ee381..f68a6dd1 100644
--- a/dashboard/xdocs/properties.xml
+++ b/dashboard/xdocs/properties.xml
@@ -83,6 +83,13 @@ maven.dashboard.rungoals = true
 # Default aggregators
 # -------------------
 
+# Properties for the Checkstyle files aggregator
+maven.dashboard.aggregator.csfiles.script = ${maven.dashboard.aggregators.dir}/csfiles.jelly
+maven.dashboard.aggregator.csfiles.artifact = ${maven.build.dir}/checkstyle-raw-report.xml
+maven.dashboard.aggregator.csfiles.label = CS Files
+maven.dashboard.aggregator.csfiles.goal = checkstyle
+maven.dashboard.aggregator.csfiles.description = Number of files checked with Checkstyle
+
 # Properties for the Checkstyle error/warning aggregator (all errors/warnings)
 maven.dashboard.aggregator.csall.script = ${maven.dashboard.aggregators.dir}/csall.jelly
 maven.dashboard.aggregator.csall.artifact = ${maven.build.dir}/checkstyle-raw-report.xml
@@ -153,6 +160,20 @@ maven.dashboard.aggregator.junitpassrate.label = JUnit Pass Rate
 maven.dashboard.aggregator.junitpassrate.goal = junit-report:report
 maven.dashboard.aggregator.junitpassrate.description = Percentage of JUnit tests that have passed vs tests in error or failed
 
+# Properties for the PMD violations aggregator 
+maven.dashboard.aggregator.pmdfiles.script = ${maven.dashboard.aggregators.dir}/pmdfiles.jelly
+maven.dashboard.aggregator.pmdfiles.artifact = ${maven.build.dir}/pmd-raw-report.xml
+maven.dashboard.aggregator.pmdfiles.label = PMD Files with Violations
+maven.dashboard.aggregator.pmdfiles.goal = pmd:report
+maven.dashboard.aggregator.pmdfiles.description = Number of files with PMD violations
+
+# Properties for the PMD violations aggregator 
+maven.dashboard.aggregator.pmdviolations.script = ${maven.dashboard.aggregators.dir}/pmdviolations.jelly
+maven.dashboard.aggregator.pmdviolations.artifact = ${maven.build.dir}/pmd-raw-report.xml
+maven.dashboard.aggregator.pmdviolations.label = PMD Violations
+maven.dashboard.aggregator.pmdviolations.goal = pmd:report
+maven.dashboard.aggregator.pmdviolations.description = Number of PMD violations
+
 # Properties for the Simian duplicate lines aggregator 
 maven.dashboard.aggregator.simiantdl.script = ${maven.dashboard.aggregators.dir}/simiantdl.jelly
 maven.dashboard.aggregator.simiantdl.artifact = ${maven.build.dir}/generated-xdocs/simian-report.xml
@@ -162,4 +183,4 @@ maven.dashboard.aggregator.simiantdl.description = Simian Total Duplicate Lines
 ]]></source>
     </section>
   </body>
-</document>
\ No newline at end of file
+</document>