diff --git a/javahelp2.changes b/javahelp2.changes
index b3a3ae2..b244fca 100644
--- a/javahelp2.changes
+++ b/javahelp2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr 15 14:07:51 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Build classpath directly with the jar files and not with symlink
+  that might not exist.
+
 -------------------------------------------------------------------
 Mon Sep 18 21:07:13 UTC 2017 - fstrba@suse.com
 
diff --git a/javahelp2.spec b/javahelp2.spec
index 0f8444e..03c4788 100644
--- a/javahelp2.spec
+++ b/javahelp2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package javahelp2
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -21,7 +21,7 @@ Name:           javahelp2
 Version:        2.0.05
 Release:        0
 Summary:        Java online help system
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Development/Libraries/Java
 Url:            https://javahelp.dev.java.net/
 Source0:        %{name}-src-%{version}.tar.bz2
@@ -84,8 +84,8 @@ find . -type f -name .bat | xargs rm -f
 #
 rm jhMaster/JavaHelp/src/new/javax/help/plaf/basic/BasicNativeContentViewerUI.java
 mkdir javahelp_nbproject/lib
-ln -s %{_javadir}/jsp.jar javahelp_nbproject/lib/jsp-api.jar
-ln -s %{_javadir}/servlet.jar javahelp_nbproject/lib/servlet-api.jar
+ln -s $(build-classpath geronimo-jsp-2.0-api) javahelp_nbproject/lib/jsp-api.jar
+ln -s $(build-classpath geronimo-servlet-2.4-api) javahelp_nbproject/lib/servlet-api.jar
 cp %{SOURCE4} .
 
 %build