diff --git a/dashboard/src/plugin-resources/aggregators/fbfiles.jelly b/dashboard/src/plugin-resources/aggregators/fbfiles.jelly
new file mode 100644
index 00000000..2cca6165
--- /dev/null
+++ b/dashboard/src/plugin-resources/aggregators/fbfiles.jelly
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+
+<!-- 
+/*
+ * Copyright 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.
+ */
+ -->
+
+<!--
+   ========================================================================
+     FindBugs aggregator. Extracts count of files with violations from 
+     FindBugs 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.fbfiles.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/fbviolations.jelly b/dashboard/src/plugin-resources/aggregators/fbviolations.jelly
new file mode 100644
index 00000000..3d962f38
--- /dev/null
+++ b/dashboard/src/plugin-resources/aggregators/fbviolations.jelly
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+
+<!-- 
+/*
+ * Copyright 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.
+ */
+ -->
+
+<!--
+   ========================================================================
+     FindBugs aggregator. Extracts violation count from FindBugs 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.fbviolations.artifact}"/>
+  <j:choose>
+    <j:when test="${artifactAsFile.exists()}">
+      <x:parse var="doc" xml="${artifactAsFile}"/>
+      <x:expr select="count($doc//BugInstance)"/>
+    </j:when>
+    <j:otherwise>
+      <j:expr value="-"/>
+    </j:otherwise>
+  </j:choose>
+
+</j:jelly>
diff --git a/dashboard/xdocs/changes.xml b/dashboard/xdocs/changes.xml
index 30cd2880..37d52c6f 100644
--- a/dashboard/xdocs/changes.xml
+++ b/dashboard/xdocs/changes.xml
@@ -25,6 +25,9 @@
   </properties>
   <body>
     <release version="1.6-SNAPSHOT" date="in CVS">
+      <action dev="vmassol" type="fix" issue="MPDASHBOARD-16">
+        Added Findbugs aggregators which were missing.
+      </action>
     </release>
     <release version="1.5" date="2004-10-15">
       <action dev="vmassol" type="add">Added dashboard report example to the Dashboard plugin web site.</action>
