diff --git a/ldapjdk.spec b/ldapjdk.spec
index 0848cea..6cbaed7 100644
--- a/ldapjdk.spec
+++ b/ldapjdk.spec
@@ -12,7 +12,7 @@ Name:             ldapjdk
 # Downstream release number:
 # - development/stabilization (unsupported): 0.<n> where n >= 1
 # - GA/update (supported): <n> where n >= 1
-%global           release_number 1
+%global           release_number 2
 
 # Development phase:
 # - development (unsupported): alpha<n> where n >= 1
@@ -53,9 +53,9 @@ ExclusiveArch:    %{java_arches} noarch
 # Java
 ################################################################################
 
-%define java_devel java-17-openjdk-devel
-%define java_headless java-17-openjdk-headless
-%define java_home %{_jvmdir}/jre-17-openjdk
+%define java_devel java-devel
+%define java_headless java-headless
+%define java_home %{_jvmdir}/jre-openjdk
 
 ################################################################################
 # Build Dependencies
@@ -160,6 +160,12 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom
 
 ################################################################################
 %changelog
+* Sun Mar 03 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 5.5.0-2
+- Really rebuilt for java-21-openjdk as system jdk
+
+* Sat Mar 02 2024 Jiri Vanek <jvanek@redhat.com> - 5.5.0-1.1
+- Rebuilt for java-21-openjdk as system jdk
+
 * Wed Feb 21 2024 Dogtag PKI Team <devel@lists.dogtagpki.org> 5.5.0-1
 - Rebase to LDAP SDK 5.5.0