diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 09a48e1986..3fb2e02fb3 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -365,6 +365,9 @@ Release 2.0.0 - UNRELEASED
     HADOOP-7350. Use ServiceLoader to discover compression codec classes.
     (tomwhite)
 
+    HADOOP-8284. clover integration broken, also mapreduce poms are pulling
+    in clover as a dependency. (phunt via tucu)
+
   BREAKDOWN OF HADOOP-7454 SUBTASKS
 
     HADOOP-7455. HA: Introduce HA Service Protocol Interface. (suresh)
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 1281908e75..a8a478c09b 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -603,12 +603,6 @@
         <version>1.1</version>
       </dependency>
 
-      <dependency>
-        <groupId>com.cenqua.clover</groupId>
-        <artifactId>clover</artifactId>
-        <version>3.0.2</version>
-      </dependency>
-
       <dependency>
         <groupId>org.apache.zookeeper</groupId>
         <artifactId>zookeeper</artifactId>
@@ -902,6 +896,7 @@
             <groupId>com.atlassian.maven.plugins</groupId>
             <artifactId>maven-clover2-plugin</artifactId>
             <configuration>
+              <includesAllSourceRoots>true</includesAllSourceRoots>
               <includesTestSourceRoots>true</includesTestSourceRoots>
               <licenseLocation>${cloverLicenseLocation}</licenseLocation>
               <cloverDatabase>${cloverDatabase}</cloverDatabase>
@@ -912,8 +907,8 @@
             </configuration>
             <executions>
               <execution>
-                <id>setup</id>
-                <phase>generate-sources</phase>
+                <id>clover-setup</id>
+                <phase>process-sources</phase>
                 <goals>
                   <goal>setup</goal>
                 </goals>