diff --git a/.gitignore b/.gitignore
index 8d1534b..c183e84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 SOURCES/ldap-sdk-4.23.0.tar.gz
 /ldap-sdk-4.23.0.tar.gz
+/ldap-sdk-4.24.0-alpha1.tar.gz
diff --git a/ldapjdk.spec b/ldapjdk.spec
index eb49e3e..193aaf0 100644
--- a/ldapjdk.spec
+++ b/ldapjdk.spec
@@ -2,17 +2,25 @@
 Name:             ldapjdk
 ################################################################################
 
+%global           product_id idm-ldapjdk
+
+# Upstream version number:
+%global           major_version 4
+%global           minor_version 24
+%global           update_version 0
+
 Summary:          LDAP SDK
-URL:              http://www.dogtagpki.org/
+URL:              https://github.com/dogtagpki/ldap-sdk
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 
 BuildArch:        noarch
 
 # For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
 # For official (i.e. supported) releases, use x.y.z-r where r >=1.
-Version:          4.23.0
-Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
-#global           _phase -alpha1
+%global           release_number 0.1
+Version:          %{major_version}.%{minor_version}.%{update_version}
+Release:          %{release_number}%{?_timestamp}%{?_commit_id}%{?dist}
+%global           _phase -alpha1
 
 %global spname		ldapsp
 %global filtname	ldapfilt
@@ -56,32 +64,50 @@ BuildRequires:    %{java_devel}
 BuildRequires:    javapackages-local
 BuildRequires:    slf4j
 BuildRequires:    slf4j-jdk14
-BuildRequires:    jss >= 4.9.0, jss < 5.0.0
+
+BuildRequires:    jss >= 4.10, jss < 5.0
+
+%description
+The Mozilla LDAP SDKs enable you to write applications which access,
+manage, and update the information stored in an LDAP directory.
 
 ################################################################################
-# Runtime Dependencies
+%package -n %{product_id}
 ################################################################################
 
+Summary:          LDAP SDK
+
 Requires:         %{java_headless}
 Requires:         jpackage-utils >= 0:1.5
 Requires:         slf4j
 Requires:         slf4j-jdk14
-Requires:         jss >= 4.9.0, jss < 5.0.0
 
-%description
+Requires:         jss >= 4.10, jss < 5.0
+
+Obsoletes:        ldapjdk < %{version}-%{release}
+Provides:         ldapjdk = %{version}-%{release}
+Provides:         ldapjdk = %{major_version}.%{minor_version}
+Provides:         %{product_id} = %{major_version}.%{minor_version}
+
+%description -n %{product_id}
 The Mozilla LDAP SDKs enable you to write applications which access,
 manage, and update the information stored in an LDAP directory.
 
 %license docs/ldapjdk/license.txt
 
 ################################################################################
-%package javadoc
+%package -n %{product_id}-javadoc
 ################################################################################
 
-Summary:        Javadoc for %{name}
+Summary:          Javadoc for LDAP SDK
 
-%description javadoc
-Javadoc for %{name}
+Obsoletes:        ldapjdk-javadoc < %{version}-%{release}
+Provides:         ldapjdk-javadoc = %{version}-%{release}
+Provides:         ldapjdk-javadoc = %{major_version}.%{minor_version}
+Provides:         %{product_id}-javadoc = %{major_version}.%{minor_version}
+
+%description -n %{product_id}-javadoc
+Javadoc for LDAP SDK
 
 ################################################################################
 %prep
@@ -112,7 +138,7 @@ popd
 ################################################################################
 
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 java-sdk/dist/packages/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -m 644 java-sdk/dist/packages/ldapjdk.jar $RPM_BUILD_ROOT%{_javadir}/ldapjdk.jar
 install -m 644 java-sdk/dist/packages/%{spname}.jar $RPM_BUILD_ROOT%{_javadir}/%{spname}.jar
 install -m 644 java-sdk/dist/packages/%{filtname}.jar $RPM_BUILD_ROOT%{_javadir}/%{filtname}.jar
 install -m 644 java-sdk/dist/packages/%{beansname}.jar $RPM_BUILD_ROOT%{_javadir}/%{beansname}.jar
@@ -123,14 +149,14 @@ install -pm 644 java-sdk/ldapfilter/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldap
 install -pm 644 java-sdk/ldapbeans/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapbeans.pom
 install -pm 644 java-sdk/ldapsp/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapsp.pom
 
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/ldapjdk
+cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/ldapjdk
 
 ################################################################################
-%files
+%files -n %{product_id}
 ################################################################################
 
-%{_javadir}/%{name}.jar
+%{_javadir}/ldapjdk.jar
 %{_javadir}/%{spname}*.jar
 %{_javadir}/%{filtname}*.jar
 %{_javadir}/%{beansname}*.jar
@@ -140,14 +166,17 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_mavenpomdir}/JPP-ldapbeans.pom
 
 ################################################################################
-%files javadoc
+%files -n %{product_id}-javadoc
 ################################################################################
 
-%dir %{_javadocdir}/%{name}
-%{_javadocdir}/%{name}/*
+%dir %{_javadocdir}/ldapjdk
+%{_javadocdir}/ldapjdk/*
 
 ################################################################################
 %changelog
+* Tue Jan 16 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 4.24.0-0.1
+- Rebase to LDAP SDK 4.24.0-alpha1
+
 * Mon Jul 26 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 4.23.0-1
 - Rebase to LDAP SDK 4.23.0
 
diff --git a/sources b/sources
index df7b579..14015fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ldap-sdk-4.23.0.tar.gz) = 62d8ce1fd904a5c78056491ab14b6f6e2e337a5098702fd340136b43970a17b3e964c5cf6963e96de89e778e45d6188b865b74668419163704ae7c956d0868b1
+SHA512 (ldap-sdk-4.24.0-alpha1.tar.gz) = de3a2728d7b93c09cd81114dd3cc6220e4c87cb81514c17c2f925538300fa899bd567dd8a5e768f83a776e03ff0766945b5ae942a479e152ac31e17a92b6e946