diff --git a/.gitignore b/.gitignore
index 3128130..ef8d6e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 bsh-1.3.0-src.tar.bz2
+/2.0b6.tar.gz
+/bsh-2.0-b6.tar.gz
+/bsh-2.1.0.tar.gz
diff --git a/0000-source-target-1.8.patch b/0000-source-target-1.8.patch
new file mode 100644
index 0000000..5fb7dfd
--- /dev/null
+++ b/0000-source-target-1.8.patch
@@ -0,0 +1,57 @@
+diff --git a/build.xml b/build.xml
+index 8542245..6179cfa 100644
+--- a/build.xml
++++ b/build.xml
+@@ -16,8 +16,8 @@
+ 
+ <property name="file" value=""/>
+ 
+-	<property name="ant.build.javac.target" value="1.6" />
+-	<property name="ant.build.javac.source" value="1.6" />
++	<property name="ant.build.javac.target" value="1.8" />
++	<property name="ant.build.javac.source" value="1.8" />
+ 	<property name="version" value="2.1.0"/>
+ 	<property name="deprecation" value="on"/>
+ 	<property name="Specification-Title" value="BeanShell" />
+@@ -178,8 +178,8 @@
+ 			debug="on"
+ 			includes="**/*.java"
+ 			excludes="${excludes},**/bak/**"
+-			source="1.6"
+-			target="1.6"
++			source="1.8"
++			target="1.8"
+ 		>
+ 			<classpath>
+ 				<fileset refid="lib-fileset"/>
+@@ -213,8 +213,8 @@
+ 			debug="on"
+ 			includes="**/*.java"
+ 			excludes="${excludes},**/bak/**"
+-			source="1.6"
+-			target="1.6"
++			source="1.8"
++			target="1.8"
+ 		>
+ 			<classpath>
+ 				<fileset refid="lib-fileset"/>
+@@ -255,7 +255,7 @@
+ 			 destdir="${javadoc-dir}"
+ 			 author="true"
+ 			 version="true"
+-			 source="1.6"
++			 source="1.8"
+ 			 use="true"
+ 			 windowtitle="BeanShell ${version}"
+ 			 doctitle="&lt;h1&gt;BeanShell ${version}&lt;h1&gt;"
+@@ -680,8 +680,8 @@
+ 				destdir="${build-dir}"
+ 				debug="on"
+ 				debuglevel="lines,vars,source"
+-				source="1.6"
+-				target="1.6"
++				source="1.8"
++				target="1.8"
+ 			  >
+ 		 <classpath>
+ 			<path refid="test-classpath"/>
diff --git a/0001-java-11-compatibility.patch b/0001-java-11-compatibility.patch
new file mode 100644
index 0000000..36271b8
--- /dev/null
+++ b/0001-java-11-compatibility.patch
@@ -0,0 +1,27 @@
+From 9b83372c64f30f44bd56696ae6adcbe6a83e1e2f Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe@gmail.com>
+Date: Mon, 20 Jul 2020 21:28:13 +0200
+Subject: [PATCH 1/1] java 11 compatibility
+
+---
+ src/bsh/util/AWTConsole.java | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/bsh/util/AWTConsole.java b/src/bsh/util/AWTConsole.java
+index e88fbff..fbb237b 100644
+--- a/src/bsh/util/AWTConsole.java
++++ b/src/bsh/util/AWTConsole.java
+@@ -214,8 +214,8 @@ public class AWTConsole extends TextArea
+ 		Great.  What a piece of crap.
+ 	*/
+ 	public void setCaretPosition( int pos ) {
+-		((java.awt.peer.TextComponentPeer)getPeer()).setCaretPosition( 
+-			pos + countNLs() );
++		//((java.awt.peer.TextComponentPeer)getPeer()).setCaretPosition( 
++		//	pos + countNLs() );
+ 	}
+ 
+ 	/*
+-- 
+2.26.2
+
diff --git a/bsh-1.3.0.pom b/bsh-1.3.0.pom
deleted file mode 100644
index 2fdc81a..0000000
--- a/bsh-1.3.0.pom
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>bsh</groupId>
-  <artifactId>bsh</artifactId>
-  <name>Beanshell</name>
-  <version>1.3.0</version>
-</project>
diff --git a/bsh-bsf-1.3.0.pom b/bsh-bsf-1.3.0.pom
deleted file mode 100644
index ba753f0..0000000
--- a/bsh-bsf-1.3.0.pom
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>bsh</groupId>
-  <artifactId>bsh-bsf</artifactId>
-  <name>Beanshell BSFEngine</name>
-  <version>1.3.0</version>
-</project>
diff --git a/bsh-build.patch b/bsh-build.patch
deleted file mode 100644
index 31a2332..0000000
--- a/bsh-build.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- BeanShell/build.xml.orig	2004-01-20 19:12:20.888557245 -0500
-+++ BeanShell/build.xml	2004-01-20 19:13:36.150184282 -0500
-@@ -103,50 +103,7 @@
- 		value="docs/manual/bshcommands-bshdoc.xml"/>
- 
- <!-- Begin Targets -->
--
--	<!-- The javacc targets could be smarter... -->
--	<target name="checkjjt">
--		<uptodate property="jjtree.notRequired" 
--				targetfile="${src-dir}/bsh/bsh.jj"
--		>
--			<srcfiles dir="${src-dir}/bsh" includes="bsh.jjt"/>
--		</uptodate>
--	</target>
--	<target name="checkjj">
--		<uptodate property="javacc.notRequired" 
--				targetfile="${src-dir}/bsh/Parser.java"
--		>
--			<srcfiles dir="${src-dir}/bsh" includes="bsh.jj"/>
--		</uptodate>
--	</target>
--
--	<!-- Create bsh.jj when bsh.jjt changes. -->
--	<target name="jjtree" unless="jjtree.notRequired" depends="checkjjt">
--		<java classname="jjtree"
--			fork="yes"
--			failonerror="yes" >
--			<arg 
--				line="-OUTPUT_DIRECTORY=${src-dir}/bsh ${src-dir}/bsh/bsh.jjt"/>
--			<classpath>
--				<fileset refid="lib-fileset"/>
--			</classpath>
--		</java>
--	</target>
--
--	<!-- Create Parser.java when bsh.jj changes. -->
--	<target name="javacc" unless="javacc.notRequired" depends="checkjj">
--		<java classname="javacc"
--			fork="yes"
--			failonerror="yes" >
--			<!-- classpath="${javacc-lib}" -->
--			<arg line="-OUTPUT_DIRECTORY=${src-dir}/bsh ${src-dir}/bsh/bsh.jj"/>
--			<classpath>
--				<fileset refid="lib-fileset"/>
--			</classpath>
--		</java>
--	</target>
--
--	<target name="compile" depends="jjtree,javacc,builddir">
-+	<target name="compile" depends="builddir">
- 		<!-- exclude the ${excludes} as well as anything under a "bak" dir -->
- 		<!--compiler="${build-compiler}"-->
- 		<javac srcdir="${src-dir}:${test-src-dir}:${bsf-src-dir}"
diff --git a/bsh-desktop.desktop b/bsh-desktop.desktop
deleted file mode 100644
index da0f1ed..0000000
--- a/bsh-desktop.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=BeanShell Desktop
-Exec=bsh-desktop
-Icon=bsh
-Terminal=false
-Type=Application
-StartupWMClass=bsh-Console
-Categories=Development;Java;
-Version=1.0
diff --git a/bsh-xsl-fixes.patch b/bsh-xsl-fixes.patch
deleted file mode 100644
index f44ccbd..0000000
--- a/bsh-xsl-fixes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/docs/faq/faq.xsl b/docs/faq/faq.xsl
-index 44615de..341b435 100644
---- a/docs/faq/faq.xsl
-+++ b/docs/faq/faq.xsl
-@@ -18,7 +18,7 @@
- <!--xsl:param name="imagedir"/-->
- 
- <!-- Output directives -->
--<xsl:output method="xhtml" indent="yes"/>
-+<xsl:output method="html" indent="yes"/>
- 
- <!-- 
- 	Root
-diff --git a/docs/manual/xsl/manual.xsl b/docs/manual/xsl/manual.xsl
-index 3b8208c..d733260 100644
---- a/docs/manual/xsl/manual.xsl
-+++ b/docs/manual/xsl/manual.xsl
-@@ -1,6 +1,6 @@
- <xsl:stylesheet	
- 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
--    xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect"
-+        xmlns:redirect="http://xml.apache.org/xalan/redirect"
-     extension-element-prefixes="redirect"
- >
- 
-@@ -29,7 +29,7 @@
- <xsl:param name="pagesdir"/>
- 
- <!-- Output directives -->
--<xsl:output method="xhtml" indent="no"/>
-+<xsl:output method="html" indent="no"/>
- 
- <!-- 
- 	Root
diff --git a/bsh.spec b/bsh.spec
index 3a162f1..6f60e19 100644
--- a/bsh.spec
+++ b/bsh.spec
@@ -29,45 +29,69 @@
 #
 
 Name:           bsh
-Version:        1.3.0
-Release:        34%{?dist}
+Version:        2.1.0
+Release:        17%{?dist}
 Epoch:          0
 Summary:        Lightweight Scripting for Java
-License:        (SPL or LGPLv2+) and Public Domain
-Source0:        %{name}-%{version}-src.tar.bz2
-#cvs -d:pserver:anonymous@beanshell.cvs.sourceforge.net:/cvsroot/beanshell login
-#cvs -z3 -d:pserver:anonymous@beanshell.cvs.sourceforge.net:/cvsroot/beanshell export -r rel_1_3_0_final BeanShell
-#tar cjf bsh-1.3.0-src.tar.bz2 BeanShell
-Source1:        bsh-1.3.0.pom
-Source2:        bsh-bsf-1.3.0.pom
-Source3:        %{name}-desktop.desktop
+URL:            https://beanshell.github.io/
+# bundled asm is BSD
+# bsf/src/bsh/util/BeanShellBSFEngine.java is public-domain
+License:        Apache-2.0 AND BSD-3-Clause AND LicenseRef-Fedora-Public-Domain
+
+# ./generate-tarball.sh
+Source0:        %{name}-%{version}.tar.gz
+# Remove bundled jars which cannot be easily verified for licensing
+# Remove code marked as SUN PROPRIETARY/CONFIDENTAIL
+Source2:        generate-tarball.sh
+
+# compatibility with Java 11:
+# - set javac / javadoc source and target values to 1.8
+Patch0:         0000-source-target-1.8.patch
+# - remove references to invisible symbols and methods
+Patch1:         0001-java-11-compatibility.patch
 
-Patch0:         %{name}-build.patch
-Patch1:         %{name}-xsl-fixes.patch
-BuildRequires:  java-devel
-BuildRequires:  ant, bsf, ImageMagick, desktop-file-utils
-BuildRequires:  servlet
-Requires:       java-headless
-Requires:       bsf
-URL:            http://www.beanshell.org/
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
+
+BuildRequires:  ant-openjdk25 
+BuildRequires:  bsf
+BuildRequires:  glassfish-servlet-api
+BuildRequires:  javacc
+BuildRequires:  javapackages-local-openjdk25
+BuildRequires:  junit
+
+Requires:       bsf
+Requires:       java-25-headless
+Requires:       jline2
+
+# Explicit javapackages-tools requires since scripts use
+# /usr/share/java-utils/java-functions
+Requires:       javapackages-tools
+
+Provides:       %{name}-utils = %{epoch}:%{version}-%{release}
+Obsoletes:      %{name}-utils < 0:2.0
+Obsoletes:      %{name}-demo < 0:2.0
+
+# bsh uses small subset of modified (shaded) classes from ancient version of
+# objecweb-asm under asm directory
+Provides:       bundled(objectweb-asm) = 1.3.6
 
 %description
 BeanShell is a small, free, embeddable, Java source interpreter with
-object scripting language features, written in Java.  BeanShell
+object scripting language features, written in Java. BeanShell
 executes standard Java statements and expressions, in addition to
-obvious scripting commands and syntax.  BeanShell supports scripted
+obvious scripting commands and syntax. BeanShell supports scripted
 objects as simple method closures like those in Perl and
-JavaScript(tm).  You can use BeanShell interactively for Java
+JavaScript(tm). You can use BeanShell interactively for Java
 experimentation and debugging or as a simple scripting engine for your
-applications.  In short: BeanShell is a dynamically interpreted Java,
-plus some useful stuff.  Another way to describe it is to say that in
+applications. In short: BeanShell is a dynamically interpreted Java,
+plus some useful stuff. Another way to describe it is to say that in
 many ways BeanShell is to Java as Tcl/Tk is to C: BeanShell is
 embeddable - You can call BeanShell from your Java applications to
 execute Java code dynamically at run-time or to provide scripting
-extensibility for your applications.  Alternatively, you can call your
+extensibility for your applications. Alternatively, you can call your
 Java applications and objects from BeanShell; working with Java
-objects and APIs dynamically.  Since BeanShell is written in Java and
+objects and APIs dynamically. Since BeanShell is written in Java and
 runs in the same space as your application, you can freely pass
 references to "real live" objects into scripts and return them as
 results.
@@ -84,161 +108,184 @@ Summary:        API documentation for %{name}
 %description javadoc
 This package provides %{summary}.
 
-%package demo
-Summary:        Demo for %{name}
-AutoReqProv:    no
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-
-%description demo
-Demonstrations and samples for %{name}.
-
-%package utils
-Summary:        %{name} utilities
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       jline1
-Provides:       %{name}-desktop = %{epoch}:%{version}-%{release}
-
-%description utils
-%{name} utilities.
-
 %prep
-%setup -q -n BeanShell
-%patch0 -p1
-%patch1 -p1
-for j in $(find . -name "*.jar"); do
-    mv $j $j.no
-done
-# remove all CVS files
-for dir in `find . -type d -name CVS`; do rm -rf $dir; done
-for file in `find . -type f -name .cvsignore`; do rm -rf $file; done
-# fix rpmlint spurious-executable-perm warnings
-for i in backbutton forwardbutton homebutton remoteconsole upbutton; do
-    chmod 644 docs/images/$i.gif
-done
+%setup -q -n beanshell-%{version}
+%patch 0 -p1
+%patch 1 -p1
+
+sed -i 's,org.apache.xalan.xslt.extensions.Redirect,http://xml.apache.org/xalan/redirect,' docs/manual/xsl/*.xsl
+
+%mvn_alias :bsh bsh:bsh bsh:bsh-bsf org.beanshell:bsh
+
+%mvn_file : %{name}
 
 %build
-mkdir -p lib
-pushd lib
-ln -sf $(build-classpath bsf)
-ln -sf $(build-classpath servlet)
-popd
-ant="ant -Dant.build.javac.source=1.5"
-$ant test dist
-(cd docs/faq && $ant)
-(cd docs/manual && $ant)
+mkdir lib
+build-jar-repository lib bsf javacc junit glassfish-servlet-api
+
+ant test dist
 
 %install
-# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-for mod in '' bsf classpath commands core reflect util; do
-    install -p -m 644 dist/%{name}${mod:+-${mod}}-%{version}.jar \
-             $RPM_BUILD_ROOT%{_javadir}/%{name}${mod:+-${mod}}.jar
-done
+%mvn_artifact pom.xml dist/%{name}-%{version}.jar
 
-# poms
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 %{SOURCE1} \
-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-install -pm 644 %{SOURCE2} \
-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-bsf.pom
+%mvn_install -J javadoc
 
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a org.beanshell:%{name}
-%add_maven_depmap JPP-%{name}-bsf.pom %{name}-bsf.jar
-
-# manual
-find docs -name ".cvswrappers" -exec rm -f {} \;
-find docs -name "*.xml" -exec rm -f {} \;
-find docs -name "*.xsl" -exec rm -f {} \;
-find docs -name "*.log" -exec rm -f {} \;
-(cd docs/manual && mv html/* .)
-(cd docs/manual && rm -rf html)
-(cd docs/manual && rm -rf xsl)
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-# menu entry
-desktop-file-install --mode=644 \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE3}
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
-convert src/bsh/util/lib/icon.gif \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/bsh.png
-
-# demo
-for i in `find tests -name \*.bsh`; do
-  perl -p -i -e 's,^\n?#!(/(usr/)?bin/java bsh\.Interpreter|/bin/sh),#!/usr/bin/env %{_bindir}/%{name},' $i
-  if head -1 $i | grep '#!/usr/bin/env %{_bindir}/%{name}' >/dev/null; then
-    chmod 755 $i
-  fi
-done
-chmod 755 tests/Template
-cat > one << EOF
-#!/bin/sh
-
-EOF
-cat tests/Interactive/reload/one >> one
-cat one > tests/Interactive/reload/one
-rm one
-cat > two << EOF
-#!/bin/sh
-
-EOF
-cat tests/Interactive/reload/two >> two
-cat two > tests/Interactive/reload/two
-rm two
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -pr tests $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/webapps
-install -m 644 dist/bshservlet.war $RPM_BUILD_ROOT%{_datadir}/%{name}/webapps
-install -m 644 dist/bshservlet-wbsh.war $RPM_BUILD_ROOT%{_datadir}/%{name}/webapps
+install -d -m 755 %{buildroot}%{_datadir}/%{name}
+install -d -m 755 %{buildroot}%{_datadir}/%{name}/webapps
+install -m 644 dist/bshservlet.war %{buildroot}%{_datadir}/%{name}/webapps
+install -m 644 dist/bshservlet-wbsh.war %{buildroot}%{_datadir}/%{name}/webapps
 
 # scripts
-install -d $RPM_BUILD_ROOT%{_bindir}
+install -d %{buildroot}%{_bindir}
 
-%jpackage_script bsh.Interpreter "\${BSH_DEBUG:+-Ddebug=true}" jline.ConsoleRunner %{name}:jline1/jline-1 %{name} true
-%jpackage_script bsh.Console "\${BSH_DEBUG:+-Ddebug=true}" "" %{name} %{name}-console true
+%jpackage_script bsh.Interpreter "\${BSH_DEBUG:+-Ddebug=true}" jline.console.internal.ConsoleRunner %{name}:jline2/jline %{name} true
+%jpackage_script bsh.Console "\${BSH_DEBUG:+-Ddebug=true}" "" bsh bsh-console true
 
-cat > $RPM_BUILD_ROOT%{_bindir}/%{name}doc << EOF
-#!/usr/bin/env %{_bindir}/%{name}
-EOF
-cat scripts/bshdoc.bsh >> $RPM_BUILD_ROOT%{_bindir}/%{name}doc
-
-%post utils
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun utils
-if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans utils
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+echo '#!%{_bindir}/bsh' > %{buildroot}%{_bindir}/bshdoc
+cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc
 
 %files -f .mfiles
-%doc src/License.txt
-%doc src/Changes.html src/README.txt
-%{_javadir}/*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/webapps
+%license LICENSE NOTICE
+%doc README.md src/Changes.html src/CodeMap.html docs/faq/faq.html
+
+%attr(0755,root,root) %{_bindir}/%{name}*
+%{_datadir}/%{name}/
 
 %files manual
-%doc src/License.txt
-%doc docs/*
+%doc docs/manual/html
+%doc docs/manual/images/*.jpg
+%doc docs/manual/images/*.gif
+%license LICENSE NOTICE
 
-%files javadoc
-%doc src/License.txt
-%{_javadocdir}/%{name}
-
-%files demo
-%doc tests/README.txt tests/Interactive/README
-%{_datadir}/%{name}/*
-
-%files utils
-%attr(0755,root,root) %{_bindir}/%{name}*
-%{_datadir}/applications/%{name}-desktop.desktop
-%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
+%files javadoc -f .mfiles-javadoc
+%license LICENSE NOTICE
 
 %changelog
+* Mon Jul 28 2025 jiri vanek <jvanek@redhat.com> - 0:2.1.0-17
+- Rebuilt for java-25-openjdk as preffered jdk
+
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.0-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.0-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.0-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed May 22 2024 Marian Koncek <mkoncek@redhat.com> - 0:2.1.0-13
+- Fix license field
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 0:2.1.0-12
+- Rebuilt for java-21-openjdk as system jdk
+
+* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 0:2.1.0-6
+- Rebuilt for Drop i686 JDKs
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 0:2.1.0-5
+- Rebuilt for java-17-openjdk as system jdk
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Dec  2 2021 Hans de Goede <hdegoede@redhat.com> - 0:2.1.0-3
+- Fix building with Java 17
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Feb 01 2021 Fabio Valentini <decathorpe@gmail.com> - 0:2.1.0-1
+- Update to version 2.1.0.
+
+* Wed Jan 27 2021 Tomas Popela <tpopela@redhat.com> - 0:2.0-22.b6
+- Don't build the desktop support on RHEL 8+ as ImageMagick isn't available there.
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-21.b6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Dec 14 2020 Jerry James <loganjerry@gmail.com> - 0:2.0-20.b6
+- Change jline Requires to jline2
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-19.b6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 20 2020 Fabio Valentini <decathorpe@gmail.com> - 0:2.0-18.b6
+- Make adjustments for Java 11 compatibility.
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 0:2.0-17.b6
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-16.b6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-15.b6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-14.b6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Aug 03 2018 Michael Simacek <msimacek@redhat.com> - 0:2.0-13.b6
+- Remove proprietary files from tarball
+
+* Mon Jul 30 2018 Severin Gehwolf <sgehwolf@redhat.com> - 0:2.0-12.b6
+- Add requirement on javapackages-tools for script's usage of
+  java-functions.
+
+* Mon Jul 30 2018 Michael Simacek <msimacek@redhat.com> - 0:2.0-11.b6
+- Repack the tarball without binaries
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-10.b6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-9.b6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sat Sep 23 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.0-8.b6
+- Properly conditionalize build-requires
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-7.b6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Jun 13 2017 Michael Simacek <msimacek@redhat.com> - 0:2.0-6.b6
+- Add conditional for desktop file
+
+* Fri Mar  3 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.0-5.b6
+- Install desktop icon to pixmaps instead of icons
+
+* Fri Mar  3 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.0-4.b6
+- Fix directory ownership
+
+* Tue Feb 07 2017 Michael Simacek <msimacek@redhat.com> - 0:2.0-3.b6
+- Build against glassfish-servlet-api
+
+* Thu Nov 24 2016 Michael Simacek <msimacek@redhat.com> - 0:2.0-2.b6
+- Install into expected location
+
+* Thu Nov 24 2016 Michael Simacek <msimacek@redhat.com> - 0:2.0-1.b6
+- Update to upstream version 2.0.b6
+
+* Wed Oct 12 2016 Ville Skyttä <ville.skytta@iki.fi> - 0:1.3.0-36
+- Switch to jline 2.x in -utils
+- Mark License.txt as %%license
+
+* Thu Jul 21 2016 Michael Simacek <msimacek@redhat.com> - 0:1.3.0-35
+- Replace perl usage with sed
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3.0-34
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
@@ -402,7 +449,7 @@ fi
 - remove bsf patch (fixed upstream)
 - add epoch to demo package Requires
 
-* Fri Apr 12 2003 David Walluck <david@anti-microsoft.org> 0:1.2-0.b8.4jpp
+* Sat Apr 12 2003 David Walluck <david@anti-microsoft.org> 0:1.2-0.b8.4jpp
 - fix strange permissions
 
 * Fri Apr 11 2003 David Walluck <david@anti-microsoft.org> 0:1.2-0.b8.3jpp
diff --git a/generate-tarball.sh b/generate-tarball.sh
new file mode 100755
index 0000000..4f222cc
--- /dev/null
+++ b/generate-tarball.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+set -e
+
+name=bsh
+version="$(sed -n 's/Version:\s*//p' *.spec)"
+
+# RETRIEVE
+wget "https://github.com/beanshell/beanshell/archive/${version}.tar.gz" -O "${name}-${version}.orig.tar.gz"
+
+rm -rf tarball-tmp
+mkdir tarball-tmp
+cd tarball-tmp
+tar xf "../${name}-${version}.orig.tar.gz"
+
+# CLEAN TARBALL
+rm -r */lib
+find -name '*.jar' -print -delete
+find -name '*.class' -print -delete
+# Files marked as SUN PROPRIETARY/CONFIDENTAIL
+rm -rv */engine/javax-src
+
+tar cf "../${name}-${version}.tar.gz" *
+cd ..
+rm -r tarball-tmp "${name}-${version}.orig.tar.gz"
diff --git a/sources b/sources
index 7e89f6a..49df674 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3d8c14c2a223aa577108efa8bd17bdd3  bsh-1.3.0-src.tar.bz2
+SHA512 (bsh-2.1.0.tar.gz) = 4cee4ffc97e0214b0ef3fbfbfacc3ec55e8bbf7b26c36e51fd03f087c9317501e4d975f4b1c4b1d04afd0a9120789c45f8ea9390598e19802bc063d367bd247e