diff --git a/dev-support/findbugs-exclude.xml b/dev-support/findbugs-exclude.xml
new file mode 100644
index 00000000000..f1f97f6c672
--- /dev/null
+++ b/dev-support/findbugs-exclude.xml
@@ -0,0 +1,30 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You 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.
+-->
+
+<FindBugsFilter>
+     <Match>
+       <Package name="org.apache.hadoop.hbase.thrift2.generated"/>
+     </Match>
+
+     <Match>
+       <Package name="org.apache.hadoop.hbase.thrift.generated"/>
+     </Match> 
+
+     <Match>
+       <Package name="org.apache.hadoop.hbase.rest.protobuf.generated"/>
+     </Match>  
+</FindBugsFilter>
diff --git a/dev-support/test-patch.properties b/dev-support/test-patch.properties
index afe21d455da..2209d270f57 100644
--- a/dev-support/test-patch.properties
+++ b/dev-support/test-patch.properties
@@ -19,5 +19,5 @@ MAVEN_OPTS="-Xmx3g"
 # Please update the per-module test-patch.properties if you update this file.
 
 OK_RELEASEAUDIT_WARNINGS=84
-OK_FINDBUGS_WARNINGS=768
+OK_FINDBUGS_WARNINGS=601
 OK_JAVADOC_WARNINGS=169
diff --git a/pom.xml b/pom.xml
index 10b13efd91b..36195872b84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -954,6 +954,16 @@
           </additionalConfig>
         </configuration>
       </plugin>
+      <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>findbugs-maven-plugin</artifactId>
+          <configuration>
+            <findbugsXmlOutput>true</findbugsXmlOutput>
+            <xmlOutput>true</xmlOutput>
+            <excludeFilterFile>${basedir}/dev-support/findbugs-exclude.xml</excludeFilterFile>
+            <effort>Max</effort>
+          </configuration>
+       </plugin>
     </plugins>
   </build>