diff --git a/tomcat.spec b/tomcat.spec
index 8476ec7..65d086d 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -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
@@ -560,6 +560,7 @@ fi
 * 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