diff --git a/ldapjdk.spec b/ldapjdk.spec
index eb973a8..fe786ea 100644
--- a/ldapjdk.spec
+++ b/ldapjdk.spec
@@ -54,16 +54,32 @@ ExclusiveArch:    %{java_arches} noarch
 # Java
 ################################################################################
 
-%define java_devel java-25-openjdk-devel
-%define java_headless java-25-openjdk-headless
-%define java_home %{_jvmdir}/jre-25-openjdk
-%define maven_local maven-local-openjdk25
+# use Java 17 on Fedora 39 or older and RHEL 9 or older
+# otherwise, use Java 21
+
+# maven-local is a subpackage of javapackages-tools
+
+%if 0%{?fedora} && 0%{?fedora} <= 39 || 0%{?rhel} && 0%{?rhel} <= 9
+
+%define java_devel java-17-openjdk-devel
+%define java_headless java-17-openjdk-headless
+%define java_home %{_jvmdir}/jre-17-openjdk
+%define maven_local maven-local-openjdk17
+
+%else
+
+%define java_devel java-21-openjdk-devel
+%define java_headless java-21-openjdk-headless
+%define java_home %{_jvmdir}/jre-21-openjdk
+%define maven_local maven-local
+
+%endif
 
 ################################################################################
 # Build Dependencies
 ################################################################################
 
-BuildRequires:    ant-openjdk25 
+BuildRequires:    ant
 BuildRequires:    %{java_devel}
 BuildRequires:    %{maven_local}
 BuildRequires:    mvn(org.slf4j:slf4j-api)
@@ -162,18 +178,9 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom
 
 ################################################################################
 %changelog
-* Tue Nov 04 2025  Dogtag PKI Team <devel@lists.dogtagpki.org> - 5.6.0-1
+* Thu Mar 20 2025  Dogtag PKI Team <devel@lists.dogtagpki.org> - 5.6.0-1
 - Rebase to LDAP SDK 5.6.0
 
-* Wed Jul 30 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 5.6.0-0.1.alpha1.4
-- Really rebuilt for java-25-openjdk as system jdk
-
-* Tue Jul 29 2025 jiri vanek <jvanek@redhat.com> - 5.6.0-0.1.alpha1.3
-- Rebuilt for java-25-openjdk as preffered jdk
-
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.0-0.1.alpha1.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
 * Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.0-0.1.alpha1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild