diff --git a/_multibuild b/_multibuild
deleted file mode 100644
index 655ec81..0000000
--- a/_multibuild
+++ /dev/null
@@ -1,3 +0,0 @@
-<multibuild>
-	<flavor>bootstrap</flavor>
-</multibuild>
diff --git a/byte-buddy.changes b/byte-buddy.changes
index fda4c4e..260cc5f 100644
--- a/byte-buddy.changes
+++ b/byte-buddy.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Sep 27 05:14:22 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Remove dependency on findbugs
+- Do not produce bootstrap package
+
 -------------------------------------------------------------------
 Thu Sep 14 23:17:38 UTC 2023 - Anton Shvetz <shvetz.anton@gmail.com>
 
diff --git a/byte-buddy.spec b/byte-buddy.spec
index 9fad97d..ba45f73 100644
--- a/byte-buddy.spec
+++ b/byte-buddy.spec
@@ -17,12 +17,7 @@
 
 
 %global base_name byte-buddy
-%global flavor @BUILD_FLAVOR@%{nil}
-%if "%{flavor}" == "bootstrap"
-%bcond_without bootstrap
-%else
-%bcond_with bootstrap
-%endif
+Name:           %{base_name}
 Version:        1.14.8
 Release:        0
 Summary:        Runtime code generation for the Java virtual machine
@@ -30,16 +25,17 @@ License:        Apache-2.0
 Group:          Development/Libraries/Java
 URL:            https://bytebuddy.net/
 Source0:        https://github.com/raphw/%{base_name}/archive/refs/tags/%{base_name}-%{version}.tar.gz
+BuildRequires:  fdupes
+BuildRequires:  jurand
 BuildRequires:  maven-local
 BuildRequires:  mvn(codes.rafael.modulemaker:modulemaker-maven-plugin)
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
 BuildRequires:  mvn(net.java.dev.jna:jna)
 BuildRequires:  mvn(net.java.dev.jna:jna-platform)
-BuildRequires:  mvn(net.sourceforge.findbugs:annotations)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-shade-plugin) >= 3.3.0
+BuildRequires:  mvn(org.apache.maven.plugins:maven-shade-plugin)
 BuildRequires:  mvn(org.apache.maven:maven-core)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
 BuildRequires:  mvn(org.eclipse.aether:aether-api)
@@ -47,20 +43,9 @@ BuildRequires:  mvn(org.eclipse.aether:aether-util)
 BuildRequires:  mvn(org.ow2.asm:asm)
 BuildRequires:  mvn(org.ow2.asm:asm-commons)
 BuildRequires:  mvn(org.sonatype.plexus:plexus-build-api)
-BuildArch:      noarch
-%if %{with bootstrap}
-Name:           %{base_name}-bootstrap
-%else
-Name:           %{base_name}
-%endif
-%if %{without bootstrap}
-BuildRequires:  %{base_name}-bootstrap
-BuildRequires:  fdupes
 Conflicts:      %{base_name}-bootstrap
 Obsoletes:      %{base_name}-bootstrap
-%else
-Conflicts:      %{base_name}
-%endif
+BuildArch:      noarch
 
 %description
 Byte Buddy is a code generation and manipulation library for creating and
@@ -84,22 +69,35 @@ API documentation for %{name}.
 %prep
 %setup -q -n %{base_name}-%{base_name}-%{version}
 
-%pom_disable_module %{base_name}-android
-%pom_disable_module %{base_name}-android-test
-%pom_disable_module %{base_name}-benchmark
-%pom_disable_module %{base_name}-gradle-plugin
-%if %{with bootstrap}
-%pom_disable_module %{base_name}-agent
-%pom_remove_plugin :%{base_name}-maven-plugin %{base_name}-dep
-%endif
+# Don't ship android or benchmark modules
+%pom_disable_module byte-buddy-android
+%pom_disable_module byte-buddy-android-test
+%pom_disable_module byte-buddy-benchmark
 
-%pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin
-%pom_remove_plugin com.mycila:license-maven-plugin
+# Don't ship gradle plugin
+%pom_disable_module byte-buddy-gradle-plugin
 
-%pom_change_dep -r com.google.code.findbugs:findbugs-annotations \
-    net.sourceforge.findbugs:annotations
+# Remove check plugins unneeded by RPM builds
+%pom_remove_plugin :jacoco-maven-plugin
+%pom_remove_plugin :license-maven-plugin
+%pom_remove_plugin :pitest-maven
+%pom_remove_plugin :coveralls-maven-plugin
+%pom_remove_plugin :spotbugs-maven-plugin
+%pom_remove_plugin :jitwatch-jarscan-maven-plugin
+%pom_remove_plugin :maven-release-plugin
+%pom_remove_plugin :nexus-staging-maven-plugin
 
-%mvn_package :byte-buddy-parent __noinstall
+# Avoid circural dependency
+%pom_remove_plugin :byte-buddy-maven-plugin byte-buddy-dep
+
+# Not interested in shading sources (causes NPE on old versions of shade plugin)
+%pom_xpath_set "pom:createSourcesJar" "false" byte-buddy
+
+# Drop build dep on findbugs annotations, used only by the above check plugins
+%pom_remove_dep -r :findbugs-annotations
+%{java_remove_annotations} byte-buddy-agent byte-buddy-dep byte-buddy-maven-plugin -n SuppressFBWarnings
+
+%{mvn_package} :byte-buddy-parent __noinstall
 
 %build
 %{mvn_build} -f \