diff --git a/.gitignore b/.gitignore
index de898e2..87c5030 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ jss-4.2.6.tar.gz
 /jss-4.6.3.tar.gz
 /jss-4.6.4.tar.gz
 /jss-4.7.0-b2.tar.gz
+/jss-4.7.0-b4.tar.gz
diff --git a/jss.spec b/jss.spec
index abb49ae..554fecc 100644
--- a/jss.spec
+++ b/jss.spec
@@ -7,8 +7,8 @@ URL:            http://www.dogtagpki.org/wiki/JSS
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 
 Version:        4.7.0
-Release:        0.2%{?_timestamp}%{?_commit_id}%{?dist}
-%global         _phase -b2
+Release:        0.4%{?_timestamp}%{?_commit_id}%{?dist}
+%global         _phase -b4
 
 # To generate the source tarball:
 # $ git clone https://github.com/dogtagpki/jss.git
@@ -160,6 +160,9 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 ################################################################################
 %changelog
+* Tue Jun 30 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.7.0-0.4
+- Rebase to latest upstream JSS v4.7.0-b4
+
 * Wed Jun 10 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.7.0-0.2
 - Rebase to latest upstream JSS 4.7.0
 - JSS Provided SSLEngine
diff --git a/sources b/sources
index eaf917e..eae7417 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jss-4.7.0-b2.tar.gz) = 6bd5fd4823ea4b14bfd53dc64796b6fcb7018a6118b943b46be7a5caf874a386802f1e6e0e542743be505d73f2b9625b0f1d479b1292c7364ac62d8cee3e4e52
+SHA512 (jss-4.7.0-b4.tar.gz) = 79c01fc513de479a63cbe164c772f9f685afe032a280f59eb3bb096a653424b3df1a9403c8cf443ffbe8b9a1d97a8aeb48064fbbe92e4c12e29767fb2a547d9f