diff --git a/tomcat.changes b/tomcat.changes
index 9b605ac..1b7804b 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr 15 13:53:30 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Build classpath directly with the geronimo jars instead of with
+  symlinks to them
+
 -------------------------------------------------------------------
 Tue Feb 19 17:22:16 UTC 2019 - malbu@suse.com
 
diff --git a/tomcat.spec b/tomcat.spec
index a82a600..1040be9 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -295,9 +295,9 @@ ant -Dbase.path="." \
     -Dtomcat-native.home="." \
     -Dcommons-daemon.native.win.mgr.exe="HACK" \
     -Dnsis.exe="HACK" \
-    -Djaxrpc-lib.jar="$(build-classpath jaxrpc)" \
+    -Djaxrpc-lib.jar="$(build-classpath geronimo-jaxrpc-1.1-api)" \
     -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \
-    -Dsaaj-api.jar="$(build-classpath geronimo-saaj-1_1-api)" \
+    -Dsaaj-api.jar="$(build-classpath geronimo-saaj-1.1-api)" \
     -Dcommons-pool.home="$(build-classpath commons-pool2)" \
     -Dcommons-dbcp.home="$(build-classpath commons-dbcp2)" \
     -Dno.build.dbcp=true \