diff --git a/antlr3.spec b/antlr3.spec
index c6f755e..6837262 100644
--- a/antlr3.spec
+++ b/antlr3.spec
@@ -1,7 +1,7 @@
 %global antlr_version 3.5.3
 %global c_runtime_version 3.4
 %global javascript_runtime_version 3.1
-%global baserelease 11
+%global baserelease 16
 
 # This package needs itself to build.  Use this to bootstrap on a new system.
 %bcond bootstrap 0
@@ -64,9 +64,9 @@ Patch:          0007-update-java-target.patch
 # Fix source for tighter gcc template checks
 Patch:          0008-unconst-cyclicdfa-gcc-14.patch
 
-BuildRequires:  ant
+BuildRequires:  ant-openjdk25 
 BuildRequires:  make
-BuildRequires:  maven-local
+BuildRequires:  maven-local-openjdk25
 %if %{without bootstrap}
 BuildRequires:  mvn(org.antlr:antlr)
 BuildRequires:  mvn(org.antlr:antlr3-maven-plugin)
@@ -74,7 +74,6 @@ BuildRequires:  mvn(org.antlr:ST4)
 BuildRequires:  mvn(org.antlr:stringtemplate)
 %endif
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-compiler-api)
@@ -87,13 +86,14 @@ BuildRequires:  libtool
 ExclusiveArch:  %{java_arches}
 
 %description
-ANother Tool for Language Recognition, is a language tool
-that provides a framework for constructing recognizers,
-interpreters, compilers, and translators from grammatical
-descriptions containing actions in a variety of target languages.
+ANother Tool for Language Recognition, is a language tool that provides a
+framework for constructing recognizers, interpreters, compilers, and
+translators from grammatical descriptions containing actions in a variety of
+target languages.
 
 %package        tool
 Summary:        ANother Tool for Language Recognition
+License:        BSD-3-Clause AND Apache-2.0
 BuildArch:      noarch
 Provides:       %{name} = %{epoch}:%{antlr_version}-%{release}
 Obsoletes:      %{name} < %{epoch}:%{antlr_version}-%{release}
@@ -103,10 +103,10 @@ Requires:       %{name}-java = %{epoch}:%{antlr_version}-%{release}
 Requires:       javapackages-tools
 
 %description    tool
-ANother Tool for Language Recognition, is a language tool
-that provides a framework for constructing recognizers,
-interpreters, compilers, and translators from grammatical
-descriptions containing actions in a variety of target languages.
+ANother Tool for Language Recognition, is a language tool that provides a
+framework for constructing recognizers, interpreters, compilers, and
+translators from grammatical descriptions containing actions in a variety of
+target languages.
 
 %package        java
 Summary:        Java run-time support for ANTLR-generated parsers
@@ -189,9 +189,9 @@ Version:        %{c_runtime_version}
 Release:        %{antlr_version}.%{baserelease}%{?dist}
 
 %description    C-docs
-This package contains doxygen documentation with instruction
-on how to use the C target in ANTLR and complete API description of the
-C run-time support for ANTLR-generated parsers.
+This package contains doxygen documentation with instruction on how to use the
+C target in ANTLR and complete API description of the C run-time support for
+ANTLR-generated parsers.
 
 %package        C++-devel
 Summary:        C++ runtime support for ANTLR-generated parsers
@@ -201,6 +201,8 @@ C++ runtime support for ANTLR-generated parsers.
 
 %prep
 %autosetup -p1 -n antlr3-%{antlr_version} -a 1
+
+%conf
 sed -i "s,\${buildNumber},`cat %{_sysconfdir}/fedora-release` `date`," tool/src/main/resources/org/antlr/antlr.properties
 
 # remove pre-built artifacts
@@ -215,6 +217,7 @@ find -type f -a -name *.class -delete
 %pom_disable_module antlr-complete
 
 %pom_remove_plugin :maven-source-plugin
+%pom_remove_plugin :maven-enforcer-plugin
 %pom_remove_plugin -r :maven-javadoc-plugin
 
 # workarounds bug in filtering (Mark invalid)
@@ -355,6 +358,25 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/
 %doc tool/LICENSE.txt
 
 %changelog
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.5.3-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Tue Sep 23 2025 Jerry James <loganjerry@gmail.com> - 1:3.5.3-15
+- Remove build dependency on maven-enforcer-plugin
+
+* Tue Jul 29 2025 jiri vanek <jvanek@redhat.com> - 1:3.5.3-14
+- Rebuilt for java-25-openjdk as preffered jdk
+
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.5.3-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.5.3-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Mon Jan 13 2025 Jerry James <loganjerry@gmail.com> - 1:3.5.3-11
+- Clarify license of the tool subpackage
+- Move configuration actions to %%conf
+
 * Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.5.3-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild