diff --git a/.gitignore b/.gitignore
index 5596185..7d74863 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/tomcat-9.0.87.redhat-00005-src.zip
+SOURCES/tomcat-9.0.87.redhat-00008-src.zip
diff --git a/.tomcat.metadata b/.tomcat.metadata
index 2c0fd0d..ac94e32 100644
--- a/.tomcat.metadata
+++ b/.tomcat.metadata
@@ -1 +1 @@
-3aeb163e738a5f2a4d2fc20f72d978813a459d5c SOURCES/tomcat-9.0.87.redhat-00005-src.zip
+d7a9c6c9ac2c92886aa3ade5c653c7854c6df1f1 SOURCES/tomcat-9.0.87.redhat-00008-src.zip
diff --git a/SPECS/tomcat.spec b/SPECS/tomcat.spec
index b4f502b..14b8074 100644
--- a/SPECS/tomcat.spec
+++ b/SPECS/tomcat.spec
@@ -32,7 +32,7 @@
 %global major_version 9
 %global minor_version 0
 %global micro_version 87
-%global packdname %{name}-%{major_version}.%{minor_version}.%{micro_version}.redhat-00005-src
+%global packdname %{name}-%{major_version}.%{minor_version}.%{micro_version}.redhat-00008-src
 %global servletspec 4.0
 %global elspec 3.0
 %global tcuid 53
@@ -56,7 +56,7 @@
 Name:          tomcat
 Epoch:         1
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       1%{?dist}.2
+Release:       2%{?dist}.1
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 License:       ASL 2.0
@@ -93,7 +93,7 @@ BuildRequires: aqute-bnd
 BuildRequires: aqute-bndlib
 BuildRequires: systemd
 
-Requires:      (java-headless >= 1:1.8 or java-1.8.0-headless or java-11-headless or java-17-headless or java >= 1:1.8)
+Requires:      (java-headless >= 1:1.8 or java-1.8.0-headless or java-11-headless or java-17-headless or java-21-headless or java >= 1:1.8)
 Requires:      javapackages-tools
 Requires:      %{name}-lib = %{epoch}:%{version}-%{release}
 %if 0%{?fedora} || 0%{?rhel} > 7
@@ -557,21 +557,29 @@ fi
 
 
 %changelog
-* Thu Aug 08 2024 Adam Krajcik <akrajcik@redhat.com> - 1:9.0.87-1.el9_4.2
-- Resolves: RHEL-46167
-  tomcat: Improper Handling of Exceptional Conditions (CVE-2024-34750)
+* Wed Apr 02 2025 Adam Krajcik <akrajcik@redhat.com> - 1:9.0.87-2.el9_5.1
+- Resolves: RHEL-82946
+  tomcat: Potential RCE and/or information disclosure and/or information corruption with partial PUT (CVE-2025-24813)
+- Resolves: RHEL-71719
+  tomcat: RCE due to TOCTOU issue in JSP compilation (CVE-2024-50379)
 
-* Fri May 03 2024 Sokratis Zappis <szappis@redhat.com> - 1:9.0.87-1.el9_4.1
-- Resolves: RHEL-34815 - Rebase tomcat to version 9.0.87
-- Resolves: RHEL-31048
+* Thu Aug 08 2024 Adam Krajcik <akrajcik@redhat.com> - 1:9.0.87-2
+- Resolves: RHEL-46163
+  tomcat: Improper Handling of Exceptional Conditions (CVE-2024-34750)
+- Resolves: RHEL-18245 - OpenJDK 21 support for RHEL Tomcat
+
+* Fri May 03 2024 Sokratis Zappis <szappis@redhat.com> - 1:9.0.87-1
+- Resolves: RHEL-35812 - Rebase tomcat to version 9.0.87
+- Resolves: RHEL-29257
   tomcat: Apache Tomcat: WebSocket DoS with incomplete closing handshake (CVE-2024-23672)
-- Resolves: RHEL-31032
+- Resolves: RHEL-29252
   tomcat: : Apache Tomcat: HTTP/2 header handling DoS (CVE-2024-24549)
-- Resolves: RHEL-35328 - Amend tomcat's changelog
+- Resolves: RHEL-53001 - Amend tomcat's changelog
   (CVE-2023-46589, CVE-2023-45648, CVE-2023-42795, CVE-2023-42794, CVE-2023-44487, CVE-2023-41080)
 
 * Thu Jan 18 2024 Hui Wang <huwang@redhat.com> - 1:9.0.62-39
 - Resolves: RHEL-17605
+  tomcat: HTTP request smuggling via malformed trailer headers (CVE-2023-46589)
 
 * Thu Nov 23 2023 Hui Wang <huwang@redhat.com> - 1:9.0.62-38
 - Resolves: RHEL-13908