diff --git a/tomcat-9.0-osgi-build.patch b/tomcat-9.0-osgi-build.patch
index 9a77a9b..cc0ce1b 100644
--- a/tomcat-9.0-osgi-build.patch
+++ b/tomcat-9.0-osgi-build.patch
@@ -12,14 +12,13 @@
    </path>
  
    <path id="tomcat.classpath">
-@@ -3845,6 +3845,13 @@
+@@ -3845,6 +3845,12 @@
      <!-- Add bnd tasks to project -->
      <path id="bnd.classpath">
        <fileset file="${bnd.jar}" />
-+      <fileset file="${bndant.jar}" />
-+      <fileset file="${bndlib.jar}" />
-+      <fileset file="${bndlibg.jar}" />
-+      <fileset file="${bndannotation.jar}" />
++      <fileset dir="${bnd.dir}">
++        <include name="**/*.jar"/>
++      </fileset>
 +      <fileset file="${osgiannotation.jar}" />
 +      <fileset file="${osgicmpn.jar}" />
 +      <fileset file="${slf4j-api.jar}" />
diff --git a/tomcat.changes b/tomcat.changes
index 684edc3..03c9fe6 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Sep 18 06:03:34 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Modified patch:
+  * tomcat-9.0-osgi-build.patch
+    + make it more robust to change in number of artifacts in bnd
+    + do not enumerate jars, just take all jars from the aqute-bnd
+      directory into the classpath
+
 -------------------------------------------------------------------
 Tue Sep 12 11:30:29 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/tomcat.spec b/tomcat.spec
index a947075..6d83a5d 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -291,10 +291,7 @@ ant -Dbase.path="." \
     -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \
     -Dsaaj-api.jar="$(build-classpath geronimo-saaj-1.1-api)" \
     -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \
-    -Dbndant.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.ant)" \
-    -Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \
-    -Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \
-    -Dbndannotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \
+    -Dbnd.dir="%{_javadir}/aqute-bnd" \
     -Dosgiannotation.jar="$(build-classpath osgi-annotation/osgi.annotation)" \
     -Dosgi-annotations.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \
     -Dosgicmpn.jar="$(build-classpath osgi-compendium/osgi.cmpn)" \