diff --git a/.gitignore b/.gitignore
index 78c09bc..51d05d9 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-beta1.tar.gz
diff --git a/jss.rpmlintrc b/jss.rpmlintrc
new file mode 100644
index 0000000..fb50b83
--- /dev/null
+++ b/jss.rpmlintrc
@@ -0,0 +1,5 @@
+addFilter('W: spelling-error')
+addFilter('W: dangling-symlink')
+addFilter('W: no-manual-page-for-binary')
+addFilter('W: log-files-without-logrotate')
+
diff --git a/jss.spec b/jss.spec
index 7f8608c..20712e7 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.4.alpha1%{?_timestamp}%{?_commit_id}%{?dist}
-%global         _phase -alpha1
+Release:        0.4.beta1%{?_timestamp}%{?_commit_id}%{?dist}
+%global         _phase -beta1
 
 # To generate the source tarball:
 # $ git clone https://github.com/dogtagpki/jss.git
@@ -34,19 +34,21 @@ Source:         https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas
 
 %define java_devel java-11-openjdk-devel
 %define java_headless java-11-openjdk-headless
-%define java_home /usr/lib/jvm/jre-11-openjdk
+%define java_home %{_libdir}/jvm/jre-11-openjdk
 
 ################################################################################
 # Build Options
 ################################################################################
 
-# Do not build javadoc package unless --with javadoc option is specified.
+# By default the javadoc package will be built unless --without javadoc
+# option is specified.
 
-%bcond_with javadoc
+%bcond_without javadoc
 
-# Do not run unit tests unless --with test option is specified.
+# By default the build will execute unit tests unless --without test
+# option is specified.
 
-%bcond_with test
+%bcond_without test
 
 ################################################################################
 # Build Dependencies
@@ -58,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
@@ -69,7 +70,7 @@ BuildRequires:  apache-commons-lang3
 
 BuildRequires:  junit
 
-Requires:       nss >= 3.44
+Requires:       nss >= 3.66
 Requires:       %{java_headless}
 Requires:       jpackage-utils
 Requires:       slf4j
@@ -126,6 +127,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
 
@@ -138,10 +140,6 @@ modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENA
     --install-dir=%{buildroot} \
     install
 
-%if !%{with javadoc}
-rm -rf %{buildroot}/usr/share/javadoc/jss-%{version}
-%endif
-
 ################################################################################
 %files
 
@@ -156,11 +154,14 @@ rm -rf %{buildroot}/usr/share/javadoc/jss-%{version}
 %files javadoc
 
 %defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}/
+%{_javadocdir}/%{name}/
 %endif
 
 ################################################################################
 %changelog
+* Thu Sep 16 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-0.5.beta1
+- Rebase to JSS 5.0.0-beta1
+
 * Thu Sep 09 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-0.4.alpha1
 - Drop BuildRequires and Requires on glassfish-jaxb-api
   Resolves #2002576
diff --git a/sources b/sources
index 3d73504..15f1b12 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jss-5.0.0-alpha1.tar.gz) = 27c18c88cea85a62e9dd2b1c4bf7223629938fd1a47d5c0c9168eaa3ab79366961dd9c6a17cd2c37633b18b9287776ecb2b027090425d530cddb4d056b220e39
+SHA512 (jss-5.0.0-beta1.tar.gz) = 9413102a75e6d73b81b3adaeda65958f2363f075e8295cc2e796afaf0aae2c0e1942734cd3314754d5bccc21f92d3bfa16515e63954b0a4239f7ba85e2ce8f95