diff --git a/.gitignore b/.gitignore
index 788ee07..366b277 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
 /*.src.rpm
 
 /bsf-src-2.4.0.tar.gz
+bsf-src-2.4.0.tar.gz
+build-file.patch
+build.properties.patch
diff --git a/bsf.spec b/bsf.spec
index 4485819..849865a 100644
--- a/bsf.spec
+++ b/bsf.spec
@@ -1,7 +1,6 @@
 Name:           bsf
-Epoch:          0
 Version:        2.4.0
-Release:        41%{?dist}
+Release:        42%{?dist}
 Summary:        Bean Scripting Framework
 License:        ASL 2.0
 URL:            http://commons.apache.org/bsf/
@@ -10,14 +9,14 @@ BuildArch:      noarch
 Source0:        http://apache.mirror.anlx.net//commons/%{name}/source/%{name}-src-%{version}.tar.gz
 Source1:        %{name}-pom.xml
 
-Patch0:         java-11-fixes.patch
+Patch0:         build-file.patch
+Patch1:         build.properties.patch
 
 BuildRequires:  javapackages-local
 BuildRequires:  ant
-BuildRequires:  apache-commons-logging
 BuildRequires:  apache-parent
-BuildRequires:  rhino
 BuildRequires:  xalan-j2
+BuildRequires:  apache-commons-logging
 
 %description
 Bean Scripting Framework (BSF) is a set of Java classes which provides
@@ -45,38 +44,33 @@ engines:
 * JRuby
 * JudoScript
 
-%package javadoc
-Summary:        Javadoc for %{name}
-
-%description javadoc
-Javadoc for %{name}.
-
 %prep
 %setup -q
 %patch0 -p1
-
+%patch1 -p1
 find -name \*.jar -delete
 
 %mvn_file : %{name}
 %mvn_alias : org.apache.bsf:
 
 %build
-export CLASSPATH=$(build-classpath apache-commons-logging rhino xalan-j2)
-ant jar javadocs
+export CLASSPATH=$(build-classpath apache-commons-logging xalan-j2)
+ant -Dsource.level=1.6 jar
 
 %mvn_artifact %{SOURCE1} build/lib/%{name}.jar
 
 %install
-%mvn_install -J build/javadocs
+%mvn_install
 
 %files -f .mfiles
 %license LICENSE.txt NOTICE.txt
 %doc AUTHORS.txt CHANGES.txt README.txt TODO.txt RELEASE-NOTE.txt
 
-%files javadoc -f .mfiles-javadoc
-%license LICENSE.txt NOTICE.txt
-
 %changelog
+* Mon Jun 21 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.0-42
+- Remove dependency on rhino
+- Resolves: rhbz#1971743
+
 * Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0:2.4.0-41
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
@@ -98,12 +92,21 @@ ant jar javadocs
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.4.0-35
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.0-32
+- Mass rebuild for javapackages-tools 201902
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.0-32
+- Mass rebuild for javapackages-tools 201902
+
 * Wed Aug 14 2019 Fabio Valentini <decathorpe@gmail.com> - 0:2.4.0-34
 - Remove BuildRequires: rhino.
 
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.4.0-33
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.0-31
+- Mass rebuild for javapackages-tools 201901
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.4.0-32
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/build-file.patch b/build-file.patch
new file mode 100644
index 0000000..87b2c2b
--- /dev/null
+++ b/build-file.patch
@@ -0,0 +1,33 @@
+--- 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
+@@ -102,7 +102,7 @@
+ 		<pathelement location="${build.tests}"/>
+ 	</path>
+ 
+-	<target name="init" depends="clean">
++	<target name="init">
+ 		<tstamp />
+ 
+ 
+@@ -134,11 +134,13 @@
+ 
+ 		<available property="junit.present" classname="junit.framework.TestCase" />
+ 
++		<!--
+ 		<uptodate property="javac.notRequired" targetfile="${build.lib}/${project.name}.jar">
+ 			<srcfiles dir="${src.dir}">
+ 				<patternset refid="javac.source.files" />
+ 			</srcfiles>
+ 		</uptodate>
++		-->		
+ 
+ 		<uptodate property="javadoc.required" targetfile="${build.lib}/${project.name}.jar">
+ 			<srcfiles dir="${build.dir}" includes="**/*.html" />
+@@ -268,6 +270,7 @@
+ 		<mkdir dir="${build.javadocs}" />
+ 		<!-- FIXME: Excluding some packages temporarily -->
+ 		<javadoc packagenames="${packages}" failonerror="true" excludepackagenames="org.apache.bsf.engines.java, org.apache.bsf.engines.javaclass" destdir="${build.javadocs}" author="true" version="false" use="true" windowtitle="${project.fullName} API" doctitle="${project.fullName}" source="${source.level}">
++			<arg value="-Xdoclint:none" />
+ 			<classpath refid="compile.classpath" />
+ 			<fileset dir="${src.dir}">
+ 				<patternset refid="java.source.files"></patternset>
diff --git a/build.properties.patch b/build.properties.patch
new file mode 100644
index 0000000..3ea3f72
--- /dev/null
+++ b/build.properties.patch
@@ -0,0 +1,47 @@
+diff --new-file -r -u bsf-2.4.0-orig/build-properties.xml bsf-2.4.0/build-properties.xml
+--- bsf-2.4.0-orig/build-properties.xml	1970-01-01 01:00:00.000000000 +0100
++++ bsf-2.4.0/build-properties.xml	2007-05-23 15:33:04.000000000 +0200
+@@ -0,0 +1,43 @@
++<?xml version="1.0" encoding="utf-8"?>
++<project name="props">
++    <property name="project.name" value="bsf"/>
++    <property name="project.fullName" value="Bean Scripting Framework"/>
++    <property name="project.version" value="2.4.0"/>
++    <property name="project.debug" value="on"/>
++    <property name="project.deprecation" value="on"/>
++
++    <property name="build.file" value="build.xml"/>
++    <property name="build.dir" value="build"/>
++    <property name="build.dest" value="build/classes"/>
++    <property name="build.lib" value="build/lib"/>
++    <property name="build.lib.win32" value="build/lib/win32"/>
++    <property name="build.samples" value="build/samples"/>
++    <property name="build.samples.calc" value="build/samples/calc"/>
++    <property name="build.samples.scriptedui" value="build/samples/scriptedui"/>
++    <property name="build.samples.xsl" value="build/samples/xsl"/>
++    <property name="build.javadocs" value="build/javadocs"/>
++    <property name="build.tests" value="build/testcases" />
++
++    <property name="dist.dir" value="dist"/>
++    <property name="dist.dir.root" value="${dist.dir}/${project.name}-${project.version}"/>
++    <property name="dist.bin.file" value="${dist.dir}/${project.name}-bin-${project.version}"/>
++    <property name="dist.src.file" value="${dist.dir}/${project.name}-src-${project.version}"/>
++
++    <property name="packages" value="org.apache.*"/>
++
++    <property name="samples.dir" value="samples"/>
++
++    <property name="site.src" location="xdocs"/>
++    <property name="site.dest" location="docs"/>
++    <property name="site.projectFile" value="stylesheets/project.xml"/>
++
++    <property name="source.level" value="1.3" />
++
++    <property name="src.dir" value="src"/>
++
++    <property name="templ.path" location="xdocs/stylesheets"/>
++
++    <property name="tests.dir" value="test"/>
++
++    <property name="velocity.props" location="${site.src}/velocity.properties"/>
++</project>
diff --git a/java-11-fixes.patch b/java-11-fixes.patch
deleted file mode 100644
index 043c7e5..0000000
--- a/java-11-fixes.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff --git a/build-properties.xml b/build-properties.xml
-new file mode 100644
-index 0000000..18d14cc
---- /dev/null
-+++ b/build-properties.xml
-@@ -0,0 +1,44 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<project name="props">
-+    <property name="project.name" value="bsf"/>
-+    <property name="project.fullName" value="Bean Scripting Framework"/>
-+    <property name="project.version" value="2.4.0"/>
-+    <property name="project.debug" value="on"/>
-+    <property name="project.deprecation" value="on"/>
-+
-+    <property name="build.file" value="build.xml"/>
-+    <property name="build.dir" value="build"/>
-+    <property name="build.dest" value="build/classes"/>
-+    <property name="build.lib" value="build/lib"/>
-+    <property name="build.lib.win32" value="build/lib/win32"/>
-+    <property name="build.samples" value="build/samples"/>
-+    <property name="build.samples.calc" value="build/samples/calc"/>
-+    <property name="build.samples.scriptedui" value="build/samples/scriptedui"/>
-+    <property name="build.samples.xsl" value="build/samples/xsl"/>
-+    <property name="build.javadocs" value="build/javadocs"/>
-+    <property name="build.tests" value="build/testcases" />
-+
-+    <property name="dist.dir" value="dist"/>
-+    <property name="dist.dir.root" value="${dist.dir}/${project.name}-${project.version}"/>
-+    <property name="dist.bin.file" value="${dist.dir}/${project.name}-bin-${project.version}"/>
-+    <property name="dist.src.file" value="${dist.dir}/${project.name}-src-${project.version}"/>
-+
-+    <property name="packages" value="org.apache.*"/>
-+
-+    <property name="samples.dir" value="samples"/>
-+
-+    <property name="site.src" location="xdocs"/>
-+    <property name="site.dest" location="docs"/>
-+    <property name="site.projectFile" value="stylesheets/project.xml"/>
-+
-+    <property name="source.level" value="1.8" />
-+    <property name="target.level" value="1.8" />
-+
-+    <property name="src.dir" value="src"/>
-+
-+    <property name="templ.path" location="xdocs/stylesheets"/>
-+
-+    <property name="tests.dir" value="test"/>
-+
-+    <property name="velocity.props" location="${site.src}/velocity.properties"/>
-+</project>
-diff --git a/build.xml b/build.xml
-index 39d31e1..1792f70 100644
---- a/build.xml
-+++ b/build.xml
-@@ -102,7 +102,7 @@ Copyright:
- 		<pathelement location="${build.tests}"/>
- 	</path>
- 
--	<target name="init" depends="clean">
-+	<target name="init">
- 		<tstamp />
- 
- 
-@@ -134,11 +134,13 @@ Copyright:
- 
- 		<available property="junit.present" classname="junit.framework.TestCase" />
- 
-+		<!--
- 		<uptodate property="javac.notRequired" targetfile="${build.lib}/${project.name}.jar">
- 			<srcfiles dir="${src.dir}">
- 				<patternset refid="javac.source.files" />
- 			</srcfiles>
- 		</uptodate>
-+		-->
- 
- 		<uptodate property="javadoc.required" targetfile="${build.lib}/${project.name}.jar">
- 			<srcfiles dir="${build.dir}" includes="**/*.html" />
-@@ -214,7 +216,7 @@ Copyright:
- 	<!-- =================================================================== -->
- 	<target name="compile" description="Compiles the BSF *.java files." depends="prepare">
- 		<mkdir dir="${build.dest}"/>
--		<javac srcdir="${src.dir}" destdir="${build.dest}" debug="${project.debug}" deprecation="${project.deprecation}" source="${source.level}">
-+		<javac srcdir="${src.dir}" destdir="${build.dest}" debug="${project.debug}" deprecation="${project.deprecation}" source="${source.level}" target="${target.level}">
- 			<classpath>
- 				<fileset dir="lib">
- 					<include name="*.jar"/>
-@@ -256,9 +258,9 @@ Copyright:
- 		<copy todir="${build.samples}">
- 			<fileset dir="${samples.dir}" />
- 		</copy>
--		<javac srcdir="${build.samples.calc}" destdir="${build.samples.calc}" classpath="${build.lib}/${project.name}.jar" debug="${project.debug}" deprecation="${project.deprecation}" source="${source.level}" />
--		<javac srcdir="${build.samples.scriptedui}" destdir="${build.samples.scriptedui}" classpath="${build.lib}/${project.name}.jar" debug="${project.debug}" deprecation="${project.deprecation}" source="${source.level}" />
--		<javac srcdir="${build.samples.xsl}" destdir="${build.samples.xsl}" classpath="${build.lib}/${project.name}.jar" debug="${project.debug}" deprecation="${project.deprecation}" source="${source.level}" />
-+		<javac srcdir="${build.samples.calc}" destdir="${build.samples.calc}" classpath="${build.lib}/${project.name}.jar" debug="${project.debug}" deprecation="${project.deprecation}" source="${source.level}" target="${target.level}" />
-+		<javac srcdir="${build.samples.scriptedui}" destdir="${build.samples.scriptedui}" classpath="${build.lib}/${project.name}.jar" debug="${project.debug}" deprecation="${project.deprecation}" source="${source.level}" target="${target.level}" />
-+		<javac srcdir="${build.samples.xsl}" destdir="${build.samples.xsl}" classpath="${build.lib}/${project.name}.jar" debug="${project.debug}" deprecation="${project.deprecation}" source="${source.level}" target="${target.level}" />
- 	</target>
- 
- 	<!-- =================================================================== -->
-@@ -268,7 +270,7 @@ Copyright:
- 		<mkdir dir="${build.javadocs}" />
- 		<!-- FIXME: Excluding some packages temporarily -->
- 		<javadoc packagenames="${packages}" failonerror="true" excludepackagenames="org.apache.bsf.engines.java, org.apache.bsf.engines.javaclass" destdir="${build.javadocs}" author="true" version="false" use="true" windowtitle="${project.fullName} API" doctitle="${project.fullName}" source="${source.level}">
--			<classpath refid="compile.classpath" />
-+			<arg value="-Xdoclint:none" />
- 			<fileset dir="${src.dir}">
- 				<patternset refid="java.source.files"></patternset>
- 			</fileset>
-@@ -375,7 +377,7 @@ Copyright:
- 	<!-- =================================================================== -->
- 	<target name="compile-test" if="junit.present" depends="compile">
- 		<mkdir dir="${build.tests}" />
--		<javac srcdir="${tests.dir}" destdir="${build.tests}" classpath="${build.dest}" source="${source.level}" />
-+		<javac srcdir="${tests.dir}" destdir="${build.tests}" classpath="${build.dest}" source="${source.level}" target="${target.level}" />
- 	</target>
- 
- 	<!-- =================================================================== -->
diff --git a/sources b/sources
index 5293b72..e20f8f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7e58b2a009c0f70ab36bbef420b25c07  bsf-src-2.4.0.tar.gz
+SHA512 (bsf-src-2.4.0.tar.gz) = a1e7564fd14abbf725fee75c4b0ba5f92d7eada0e242ad05897753bb4afe639d859c42cae1d684e8dd9151409d4cc68e1a422a70bc74d8016144cc30d03a2d43