diff --git a/codestyle/findbugs-exclude.xml b/codestyle/findbugs-exclude.xml
index 99ee4b92a9..e77c1e363e 100644
--- a/codestyle/findbugs-exclude.xml
+++ b/codestyle/findbugs-exclude.xml
@@ -15,6 +15,17 @@
 
             <Bug pattern="EI_EXPOSE_REP"/>
             <Bug pattern="EI_EXPOSE_REP2"/>
+
+            <!-- Pre-existing patterns newly detected by SpotBugs 4.8.6 (upgraded from 4.0.0).
+                 These are all pre-existing code patterns, not regressions introduced by the upgrade.
+                 They should be addressed in follow-up work and removed from this filter. -->
+            <Bug pattern="CT_CONSTRUCTOR_THROW"/>
+            <Bug pattern="MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR"/>
+            <Bug pattern="MS_EXPOSE_REP"/>
+            <Bug pattern="NP_NONNULL_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"/>
+            <Bug pattern="PA_PUBLIC_MUTABLE_OBJECT_ATTRIBUTE"/>
+            <Bug pattern="REFLC_REFLECTION_MAY_INCREASE_ACCESSIBILITY_OF_CLASS"/>
+            <Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"/>
         </Or>
     </Match>
     <Match>
diff --git a/pom.xml b/pom.xml
index dd1c962776..f3cdba1fc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
         <dependency>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-annotations</artifactId>
-            <version>4.6.0</version>
+            <version>4.8.6</version>
         </dependency>
         <dependency>
             <groupId>com.vdurmont</groupId>
@@ -426,7 +426,14 @@
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
-                <version>4.0.0</version>
+                <version>4.8.6.8</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.github.spotbugs</groupId>
+                        <artifactId>spotbugs</artifactId>
+                        <version>4.8.6</version>
+                    </dependency>
+                </dependencies>
                 <configuration>
                     <skip>${skipTests}</skip>
                     <effort>Max</effort>