diff --git a/bsf.changes b/bsf.changes
index 6f4217a..e8418d5 100644
--- a/bsf.changes
+++ b/bsf.changes
@@ -1,7 +1,9 @@
 -------------------------------------------------------------------
 Tue Nov 27 09:13:05 UTC 2018 - Fridrich Strba <fstrba@suse.com>
 
-- Fix build of script providers
+- Modified patch:
+  * build-file.patch
+    + Fix build of script providers
 
 -------------------------------------------------------------------
 Wed May 16 05:52:07 UTC 2018 - fstrba@suse.com
diff --git a/bsf.spec b/bsf.spec
index f12e011..aa9bdec 100644
--- a/bsf.spec
+++ b/bsf.spec
@@ -93,7 +93,6 @@ rm -fr bsf
 %build
 mkdir -p lib
 build-jar-repository -s -p lib apache-commons-logging rhino xalan-j2
-export CLASSPATH=$(build-classpath apache-commons-logging rhino xalan-j2)
 %{ant} -Dant.build.javac.source=8 -Dant.build.javac.target=8 jar javadocs
 
 %install
diff --git a/build-file.patch b/build-file.patch
index 7c15cfd..fc877c6 100644
--- a/build-file.patch
+++ b/build-file.patch
@@ -1,5 +1,6 @@
---- bsf-2.4.0-orig/build.xml	2009-09-09 11:51:20.000000000 +0200
-+++ bsf-2.4.0/build.xml	2009-09-14 08:42:17.000000000 +0200
+diff -urEbwB bsf-2.4.0-orig/build.xml bsf-2.4.0/build.xml
+--- bsf-2.4.0-orig/build.xml	2018-11-27 10:25:00.759233502 +0100
++++ bsf-2.4.0/build.xml	2018-11-27 10:28:36.864365763 +0100
 @@ -102,7 +102,7 @@
  		<pathelement location="${build.tests}"/>
  	</path>
@@ -9,9 +10,68 @@
  		<tstamp />
  
  
-@@ -134,11 +134,13 @@
- 
- 		<available property="junit.present" classname="junit.framework.TestCase" />
+@@ -122,23 +122,61 @@
+ 		<!-- ================================================================= -->
+ 		<!-- Determines what optional components are available                 -->
+ 		<!-- ================================================================= -->
+-		<available property="jacl.present" classname="tcl.lang.JACL" />
+-
+-		<available property="jython.present" classname="org.python.util.jython" />
+-
+-		<available property="netrexx.present" classname="netrexx.lang.Rexx" />
+-
+-		<available property="rhino.present" classname="org.mozilla.javascript.Scriptable" />
+-
+-		<available property="xalan.present" classname="org.apache.xalan.xslt.EnvironmentCheck" />
+-
+-		<available property="junit.present" classname="junit.framework.TestCase" />
++		<available property="jacl.present" classname="tcl.lang.JACL">
++			<classpath>
++				<fileset dir="lib">
++					<include name="*.jar"/>
++				</fileset>
++			</classpath>
++		</available>
++
++		<available property="jython.present" classname="org.python.util.jython">
++			<classpath>
++				<fileset dir="lib">
++					<include name="*.jar"/>
++				</fileset>
++			</classpath>
++		</available>
++
++		<available property="netrexx.present" classname="netrexx.lang.Rexx">
++			<classpath>
++				<fileset dir="lib">
++					<include name="*.jar"/>
++				</fileset>
++			</classpath>
++		</available>
++
++		<available property="rhino.present" classname="org.mozilla.javascript.Scriptable">
++			<classpath>
++				<fileset dir="lib">
++					<include name="*.jar"/>
++				</fileset>
++			</classpath>
++		</available>
++
++		<available property="xalan.present" classname="org.apache.xalan.xslt.EnvironmentCheck">
++			<classpath>
++				<fileset dir="lib">
++					<include name="*.jar"/>
++				</fileset>
++			</classpath>
++		</available>
++
++		<available property="junit.present" classname="junit.framework.TestCase">
++			<classpath>
++				<fileset dir="lib">
++					<include name="*.jar"/>
++				</fileset>
++			</classpath>
++		</available>
  
 +		<!--
  		<uptodate property="javac.notRequired" targetfile="${build.lib}/${project.name}.jar">