diff --git a/.gitignore b/.gitignore
index 78c09bc..5ea8d6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ jss-4.2.6.tar.gz
 /jss-4.8.1.tar.gz
 /jss-4.9.0-alpha1.tar.gz
 /jss-5.0.0-alpha1.tar.gz
+/jss-5.0.0-alpha2.tar.gz
diff --git a/jss.spec b/jss.spec
index 5db023e..95e275b 100644
--- a/jss.spec
+++ b/jss.spec
@@ -9,8 +9,8 @@ License:        MPLv1.1 or GPLv2+ or LGPLv2+
 # 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:        5.0.0
-Release:        0.2.alpha1%{?_timestamp}%{?_commit_id}%{?dist}
-%global         _phase -alpha1
+Release:        0.3.alpha2%{?_timestamp}%{?_commit_id}%{?dist}
+%global         _phase -alpha2
 
 # To generate the source tarball:
 # $ git clone https://github.com/dogtagpki/jss.git
@@ -40,10 +40,15 @@ Source:         https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas
 # Build Options
 ################################################################################
 
-# By default the build will not execute unit tests unless --with test
+# By default the javadoc package will be built unless --without javadoc
 # option is specified.
 
-%bcond_with test
+%bcond_without javadoc
+
+# By default the build will execute unit tests unless --without test
+# option is specified.
+
+%bcond_without test
 
 ################################################################################
 # Build Dependencies
@@ -55,9 +60,8 @@ BuildRequires:  zip
 BuildRequires:  unzip
 
 BuildRequires:  gcc-c++
-BuildRequires:  nspr-devel >= 4.13.1
-BuildRequires:  nss-devel >= 3.44
-BuildRequires:  nss-tools >= 3.44
+BuildRequires:  nss-devel >= 3.66
+BuildRequires:  nss-tools >= 3.66
 BuildRequires:  %{java_devel}
 BuildRequires:  jpackage-utils
 BuildRequires:  slf4j
@@ -67,7 +71,7 @@ BuildRequires:  apache-commons-lang3
 
 BuildRequires:  junit
 
-Requires:       nss >= 3.44
+Requires:       nss >= 3.66
 Requires:       %{java_headless}
 Requires:       jpackage-utils
 Requires:       slf4j
@@ -85,6 +89,7 @@ Java Security Services (JSS) is a java native interface which provides a bridge
 for java-based applications to use native Network Security Services (NSS).
 This only works with gcj. Other JREs require that JCE providers be signed.
 
+%if %{with javadoc}
 ################################################################################
 %package javadoc
 ################################################################################
@@ -94,6 +99,7 @@ Requires:       jss = %{version}-%{release}
 
 %description javadoc
 This package contains the API documentation for JSS.
+%endif
 
 ################################################################################
 %prep
@@ -123,6 +129,7 @@ modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENA
     --java-lib-dir=%{_jnidir} \
     --jss-lib-dir=%{_libdir}/jss \
     --version=%{version} \
+    %{!?with_javadoc:--without-javadoc} \
     %{!?with_test:--without-test} \
     dist
 
@@ -144,16 +151,21 @@ modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENA
 %{_libdir}/*
 %{_jnidir}/*
 
+%if %{with javadoc}
 ################################################################################
 %files javadoc
 
 %defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}/
+%{_javadocdir}/%{name}/
+%endif
 
 ################################################################################
 %changelog
+* Thu Aug 12 2021 Dogtag PKI Team <devel@lists.dogtagpki.org> - 5.0.0-0.3.alpha2
+- Rebase to JSS 5.0.0-alpha2
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.0-0.2.alpha1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
-* Tue Jun 22 2021 Dogtag PKI Team <devel@lists.dogtagpki.org> - 5.0.0-0.1
+* Tue Jun 22 2021 Dogtag PKI Team <devel@lists.dogtagpki.org> - 5.0.0-0.1.alpha1
 - Rebase to JSS 5.0.0-alpha1
diff --git a/sources b/sources
index 3d73504..756e287 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jss-5.0.0-alpha1.tar.gz) = 27c18c88cea85a62e9dd2b1c4bf7223629938fd1a47d5c0c9168eaa3ab79366961dd9c6a17cd2c37633b18b9287776ecb2b027090425d530cddb4d056b220e39
+SHA512 (jss-5.0.0-alpha2.tar.gz) = de48ce48f2bc6544871308394ccaa187c4aecb72b3f4d5ce5dd692e8a6f6edaa835ce12aa80c2ac0745baca05e7fb7b943ae3abafe88636c07868633111c6118