diff --git a/.gitignore b/.gitignore
index 21baf4a..e6ee572 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/tomcatjss-8.3.0.tar.gz
+SOURCES/tomcatjss-8.4.0.tar.gz
diff --git a/.tomcatjss.metadata b/.tomcatjss.metadata
index caef982..1d88f5e 100644
--- a/.tomcatjss.metadata
+++ b/.tomcatjss.metadata
@@ -1 +1 @@
-6acc0d2d8b30d9ac8e02dfa9b28b73b7226f3004 SOURCES/tomcatjss-8.3.0.tar.gz
+fee889db533634c90dffeecff165cf615bd45b7f SOURCES/tomcatjss-8.4.0.tar.gz
diff --git a/SPECS/tomcatjss.spec b/SPECS/tomcatjss.spec
index 8b99afe..0173e0e 100644
--- a/SPECS/tomcatjss.spec
+++ b/SPECS/tomcatjss.spec
@@ -6,7 +6,7 @@ Name:             tomcatjss
 
 # Upstream version number:
 %global           major_version 8
-%global           minor_version 3
+%global           minor_version 4
 %global           update_version 0
 
 # Downstream release number:
@@ -75,7 +75,7 @@ BuildRequires:    slf4j
 BuildRequires:    slf4j-jdk14
 
 # JSS
-BuildRequires:    jss = 5.3
+BuildRequires:    jss = 5.4
 
 # Tomcat
 %if 0%{?rhel} && ! 0%{?eln}
@@ -106,7 +106,7 @@ Requires:         slf4j
 Requires:         slf4j-jdk14
 
 # JSS
-Requires:         jss = 5.3
+Requires:         jss = 5.4
 
 # Tomcat
 %if 0%{?rhel} && ! 0%{?eln}
@@ -182,6 +182,9 @@ export JAVA_HOME=%{java_home}
 
 ################################################################################
 %changelog
+* Wed May 31 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 8.4.0-1
+- Rebase to Tomcat JSS 8.4.0
+
 * Fri Apr 14 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 8.3.0-1
 - Rebuilt for MSVSphere 9.2 beta