diff --git a/tomcat.spec b/tomcat.spec
index d56d7dc..5308ba2 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -86,7 +86,6 @@ BuildRequires: ecj >= 1:4.10
 BuildRequires: findutils
 BuildRequires: java-devel >= 1:1.8.0
 BuildRequires: javapackages-local
-BuildRequires: geronimo-jaxrpc
 BuildRequires: aqute-bnd
 BuildRequires: aqute-bndlib
 BuildRequires: wsdl4j
@@ -189,6 +188,9 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
 %patch3 -p0
 %patch4 -p0
 
+# Remove webservices naming resources as it's generally unused
+%{__rm} -rf java/org/apache/naming/factory/webservices
+
 
 %build
 export OPT_JAR_LIST="xalan-j2-serializer"
@@ -207,7 +209,7 @@ export OPT_JAR_LIST="xalan-j2-serializer"
       -Dtomcat-native.home="." \
       -Dcommons-daemon.native.win.mgr.exe="HACK" \
       -Dnsis.exe="HACK" \
-      -Djaxrpc-lib.jar="$(build-classpath jaxrpc)" \
+      -Djaxrpc-lib.jar="HACK" \
       -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \
       -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \
       -Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \
@@ -471,6 +473,7 @@ fi
   so I removed the maven artifacts as they aren't very useful anyway
 - Drop JSVC support as it's not very useful these days
 - Drop geronimo-saaj as it's no longer required
+- Drop geronimo-jaxrpc, which provided the webservices naming factory resources that are generally unused
 
 * Thu Apr 22 2021 Hui Wang <huwang@redhat.com> - 1:9.0.45-1
 - Update to 9.0.45