diff --git a/tomcat-build.patch b/tomcat-build.patch
new file mode 100644
index 0000000..d20b527
--- /dev/null
+++ b/tomcat-build.patch
@@ -0,0 +1,12 @@
+Index: build.xml
+===================================================================
+--- build.xml	(revision 1837267)
++++ build.xml	(working copy)
+@@ -3207,6 +3207,7 @@
+     <path id="bndlib.classpath">
+       <fileset file="${bnd.jar}" />
+       <fileset file="${bndlib.jar}" />
++      <fileset file="${bndlibg.jar}" />
+     </path>
+ 
+     <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bndlib.classpath" />
diff --git a/tomcat.spec b/tomcat.spec
index 7aa5a87..f33be29 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -94,6 +94,7 @@ Patch0:        %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.p
 Patch1:        %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
 Patch2:        %{name}-9.0.10-RemoveCompilerOptions.patch
 Patch3:        disableJavadocFailOnWarning.patch
+Patch4:        %{name}-build.patch
 
 BuildArch:     noarch
 
@@ -255,6 +256,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
 %patch1 -p0
 %patch2 -p0
 %patch3 -p0
+%patch4 -p0
 
 %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-impl) webapps/examples/WEB-INF/lib/jstl.jar
 %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-compat) webapps/examples/WEB-INF/lib/standard.jar
@@ -282,6 +284,7 @@ export OPT_JAR_LIST="xalan-j2-serializer"
       -Dsaaj-api.jar="$(build-classpath geronimo-saaj)" \
       -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \
       -Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \
+      -Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \
       -Dno.build.dbcp=true \
       -Dversion="%{version}" \
       -Dversion.build="%{micro_version}" \