diff --git a/xbean.spec b/xbean.spec
index 3dfe739..7f064eb 100644
--- a/xbean.spec
+++ b/xbean.spec
@@ -2,7 +2,7 @@
 
 Name:           xbean
 Version:        4.18
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Java plugin based web server
 License:        ASL 2.0
 URL:            https://geronimo.apache.org/xbean/
@@ -20,8 +20,10 @@ BuildRequires:  javapackages-bootstrap
 %else
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.osgi:org.osgi.core)
 BuildRequires:  mvn(org.ow2.asm:asm)
 BuildRequires:  mvn(org.ow2.asm:asm-commons)
+BuildRequires:  mvn(org.slf4j:slf4j-api)
 %endif
 
 %description
@@ -50,6 +52,17 @@ cp xbean-asm-util/src/main/java/org/apache/xbean/asm9/original/commons/AsmConsta
 # Parent POM is not packaged
 %pom_remove_parent
 
+%pom_disable_module xbean-classloader
+%pom_disable_module xbean-classpath
+%pom_disable_module xbean-bundleutils
+%pom_disable_module xbean-asm9-shaded
+%pom_disable_module xbean-finder-shaded
+%pom_disable_module xbean-naming
+%pom_disable_module xbean-blueprint
+%pom_disable_module xbean-spring
+%pom_disable_module xbean-telnet
+%pom_disable_module maven-xbean-plugin
+
 %pom_remove_dep :commons-logging-api xbean-reflect
 %pom_remove_dep :log4j xbean-reflect
 %pom_remove_dep :xbean-asm9-shaded xbean-reflect
@@ -60,8 +73,14 @@ find -name Log4jConverter.java -delete
 %pom_remove_plugin :apache-rat-plugin
 %pom_remove_plugin :maven-source-plugin
 
+%pom_remove_dep :xbean-bundleutils xbean-finder
+rm -r xbean-finder/src/main/java/org/apache/xbean/finder{,/archive}/Bundle*
+
+# Disable one test that fails on JDK 11
+sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apache/xbean/finder/archive/MJarJarArchiveTest.java
+
 %build
-%mvn_build -- -f xbean-reflect
+%mvn_build
 
 %install
 %mvn_install
@@ -73,6 +92,10 @@ find -name Log4jConverter.java -delete
 %license LICENSE NOTICE
 
 %changelog
+* Mon Jun 21 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-3
+- Enable xbean-finder
+- Resolves: rhbz#1969297
+
 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-2
 - Bootstrap build
 - Non-bootstrap build