diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index e225adcd55..32b3d099ad 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -1827,6 +1827,8 @@ Release 0.23.0 - Unreleased
     MAPREDUCE-3186. User jobs are getting hanged if the Resource manager process goes down 
     and comes up while job is getting executed. (Eric Payne via mahadev)
 
+    MAPREDUCE-3209. Jenkins reports 160 FindBugs warnings (mahadev)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
index 2c710a45e3..360038e2ec 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
@@ -26,7 +26,7 @@
 
   <properties>
     <!-- Needed for generating FindBugs warnings using parent pom -->
-    <mr.basedir>${project.parent.parent.basedir}</mr.basedir>
+    <mr.basedir>${project.parent.basedir}/..</mr.basedir>
   </properties>
 
   <dependencies>
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml
index e4c4d91219..863cb58c1b 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml
@@ -26,7 +26,7 @@
 
   <properties>
     <!-- Needed for generating FindBugs warnings using parent pom -->
-    <mr.basedir>${project.parent.parent.basedir}</mr.basedir>
+    <mr.basedir>${project.parent.basedir}/..</mr.basedir>
   </properties>
 
   <dependencies>
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
index 7d81f31749..2094a8879b 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
@@ -28,7 +28,6 @@
 
   <properties>
     <!-- Needed for generating FindBugs warnings using parent pom -->
-    <mr.basedir>../</mr.basedir>
   </properties>
 
 
@@ -258,7 +257,22 @@
     </dependency>
 
   </dependencies>
-  
+ 
+  <build>
+    <plugins>
+       <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+         <configuration>
+          <findbugsXmlOutput>true</findbugsXmlOutput>
+          <xmlOutput>true</xmlOutput>
+          <excludeFilterFile>${mr.basedir}/dev-support/findbugs-exclude.xml</excludeFilterFile>
+          <effort>Max</effort>
+       </configuration>
+     </plugin>
+    </plugins>
+  </build>
+ 
   <modules>
     <module>hadoop-mapreduce-client-core</module>
     <module>hadoop-mapreduce-client-common</module>