diff --git a/bsh.spec b/bsh.spec
index 6f60e19..a7c3349 100644
--- a/bsh.spec
+++ b/bsh.spec
@@ -30,13 +30,13 @@
 
 Name:           bsh
 Version:        2.1.0
-Release:        17%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        Lightweight Scripting for Java
-URL:            https://beanshell.github.io/
+URL:            http://www.beanshell.org/
 # 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
+License:        ASL 2.0 and BSD and Public Domain
 
 # ./generate-tarball.sh
 Source0:        %{name}-%{version}.tar.gz
@@ -51,17 +51,16 @@ Patch0:         0000-source-target-1.8.patch
 Patch1:         0001-java-11-compatibility.patch
 
 BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
 
-BuildRequires:  ant-openjdk25 
+BuildRequires:  ant
 BuildRequires:  bsf
 BuildRequires:  glassfish-servlet-api
 BuildRequires:  javacc
-BuildRequires:  javapackages-local-openjdk25
+BuildRequires:  javapackages-local
 BuildRequires:  junit
 
 Requires:       bsf
-Requires:       java-25-headless
+Requires:       java-headless
 Requires:       jline2
 
 # Explicit javapackages-tools requires since scripts use
@@ -110,8 +109,8 @@ This package provides %{summary}.
 
 %prep
 %setup -q -n beanshell-%{version}
-%patch 0 -p1
-%patch 1 -p1
+%patch0 -p1
+%patch1 -p1
 
 sed -i 's,org.apache.xalan.xslt.extensions.Redirect,http://xml.apache.org/xalan/redirect,' docs/manual/xsl/*.xsl
 
@@ -161,42 +160,6 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc
 %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