diff --git a/module-client/pom.xml b/module-client/pom.xml
index e970bad8b..b0c083113 100644
--- a/module-client/pom.xml
+++ b/module-client/pom.xml
@@ -152,6 +152,13 @@
            </reportSet>
          </reportSets>
       </plugin>
+      <plugin>
+        <groupId>com.atlassian.maven.plugins</groupId>
+        <artifactId>maven-clover2-plugin</artifactId>
+        <configuration>
+          <jdk>1.5</jdk>
+        </configuration>
+      </plugin>
 
     </plugins>
   </reporting>
diff --git a/module-httpmime/pom.xml b/module-httpmime/pom.xml
index 46981b813..6cfbb5715 100644
--- a/module-httpmime/pom.xml
+++ b/module-httpmime/pom.xml
@@ -141,6 +141,13 @@
            </reportSet>
          </reportSets>
       </plugin>
+      <plugin>
+        <groupId>com.atlassian.maven.plugins</groupId>
+        <artifactId>maven-clover2-plugin</artifactId>
+        <configuration>
+          <jdk>1.5</jdk>
+        </configuration>
+      </plugin>
 
     </plugins>
   </reporting>
diff --git a/pom.xml b/pom.xml
index b7eabfe95..c861bdd3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,7 +174,8 @@
         </configuration>
       </plugin>
       <plugin>
-        <artifactId>maven-clover-plugin</artifactId>
+        <groupId>com.atlassian.maven.plugins</groupId>
+        <artifactId>maven-clover2-plugin</artifactId>
         <configuration>
           <flushPolicy>threaded</flushPolicy>
           <flushInterval>100</flushInterval>
@@ -187,6 +188,7 @@
             <goals>
               <goal>instrument</goal>
               <goal>aggregate</goal>
+              <goal>save-history</goal>
             </goals>
           </execution>
         </executions>
@@ -212,14 +214,6 @@
          </reportSets>
       </plugin>
 
-      <plugin>
-        <artifactId>maven-clover-plugin</artifactId>
-        <configuration>
-          <jdk>1.5</jdk>
-          <licenseLocation>${clover.license}</licenseLocation>
-        </configuration>
-      </plugin>
-
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
       </plugin>