diff --git a/.gitignore b/.gitignore
index 54364a2..9d97386 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-tomcat-9.0.87.redhat-00010-src.zip
+SOURCES/tomcat-9.0.87.redhat-00012-src.zip
diff --git a/.tomcat9.metadata b/.tomcat9.metadata
new file mode 100644
index 0000000..3213092
--- /dev/null
+++ b/.tomcat9.metadata
@@ -0,0 +1 @@
+8b767b774d19e223f1fa9f4bb07e0db94234978a SOURCES/tomcat-9.0.87.redhat-00012-src.zip
diff --git a/JmxRemoteLifecycleListener.patch b/SOURCES/JmxRemoteLifecycleListener.patch
similarity index 100%
rename from JmxRemoteLifecycleListener.patch
rename to SOURCES/JmxRemoteLifecycleListener.patch
diff --git a/java-9-start-up-parameters.conf b/SOURCES/java-9-start-up-parameters.conf
similarity index 100%
rename from java-9-start-up-parameters.conf
rename to SOURCES/java-9-start-up-parameters.conf
diff --git a/rhbz-1857043.patch b/SOURCES/rhbz-1857043.patch
similarity index 100%
rename from rhbz-1857043.patch
rename to SOURCES/rhbz-1857043.patch
diff --git a/tomcat-9.0-bnd-annotation.patch b/SOURCES/tomcat-9.0-bnd-annotation.patch
similarity index 100%
rename from tomcat-9.0-bnd-annotation.patch
rename to SOURCES/tomcat-9.0-bnd-annotation.patch
diff --git a/tomcat-9.0-bootstrap-MANIFEST.MF.patch b/SOURCES/tomcat-9.0-bootstrap-MANIFEST.MF.patch
similarity index 100%
rename from tomcat-9.0-bootstrap-MANIFEST.MF.patch
rename to SOURCES/tomcat-9.0-bootstrap-MANIFEST.MF.patch
diff --git a/tomcat-9.0-catalina-policy.patch b/SOURCES/tomcat-9.0-catalina-policy.patch
similarity index 100%
rename from tomcat-9.0-catalina-policy.patch
rename to SOURCES/tomcat-9.0-catalina-policy.patch
diff --git a/tomcat-9.0-digest.script b/SOURCES/tomcat-9.0-digest.script
similarity index 100%
rename from tomcat-9.0-digest.script
rename to SOURCES/tomcat-9.0-digest.script
diff --git a/tomcat-9.0-tomcat-users-webapp.patch b/SOURCES/tomcat-9.0-tomcat-users-webapp.patch
similarity index 100%
rename from tomcat-9.0-tomcat-users-webapp.patch
rename to SOURCES/tomcat-9.0-tomcat-users-webapp.patch
diff --git a/tomcat-9.0-tool-wrapper.script b/SOURCES/tomcat-9.0-tool-wrapper.script
similarity index 100%
rename from tomcat-9.0-tool-wrapper.script
rename to SOURCES/tomcat-9.0-tool-wrapper.script
diff --git a/tomcat-9.0.conf b/SOURCES/tomcat-9.0.conf
similarity index 100%
rename from tomcat-9.0.conf
rename to SOURCES/tomcat-9.0.conf
diff --git a/tomcat-9.0.logrotate b/SOURCES/tomcat-9.0.logrotate
similarity index 100%
rename from tomcat-9.0.logrotate
rename to SOURCES/tomcat-9.0.logrotate
diff --git a/tomcat-9.0.service b/SOURCES/tomcat-9.0.service
similarity index 100%
rename from tomcat-9.0.service
rename to SOURCES/tomcat-9.0.service
diff --git a/tomcat-9.0.sysconfig b/SOURCES/tomcat-9.0.sysconfig
similarity index 100%
rename from tomcat-9.0.sysconfig
rename to SOURCES/tomcat-9.0.sysconfig
diff --git a/tomcat-9.0.wrapper b/SOURCES/tomcat-9.0.wrapper
similarity index 100%
rename from tomcat-9.0.wrapper
rename to SOURCES/tomcat-9.0.wrapper
diff --git a/tomcat-functions b/SOURCES/tomcat-functions
similarity index 100%
rename from tomcat-functions
rename to SOURCES/tomcat-functions
diff --git a/tomcat-named.service b/SOURCES/tomcat-named.service
similarity index 100%
rename from tomcat-named.service
rename to SOURCES/tomcat-named.service
diff --git a/tomcat-preamble b/SOURCES/tomcat-preamble
similarity index 100%
rename from tomcat-preamble
rename to SOURCES/tomcat-preamble
diff --git a/tomcat-server b/SOURCES/tomcat-server
similarity index 100%
rename from tomcat-server
rename to SOURCES/tomcat-server
diff --git a/tomcat9.spec b/SPECS/tomcat9.spec
similarity index 97%
rename from tomcat9.spec
rename to SPECS/tomcat9.spec
index 052ad89..71d0e58 100644
--- a/tomcat9.spec
+++ b/SPECS/tomcat9.spec
@@ -32,7 +32,7 @@
 %global major_version 9
 %global minor_version 0
 %global micro_version 87
-%global packdname tomcat-%{major_version}.%{minor_version}.%{micro_version}.redhat-00010-src
+%global packdname tomcat-%{major_version}.%{minor_version}.%{micro_version}.redhat-00012-src
 %global servletspec 4.0
 %global elspec 3.0
 %global tcuid 53
@@ -53,7 +53,7 @@
 Name:          tomcat9
 Epoch:         1
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       5%{?dist}.1
+Release:       5%{?dist}.3
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 License:       Apache-2.0
@@ -622,6 +622,22 @@ fi
 %{appdir}/ROOT
 
 %changelog
+* Thu Aug 21 2025 Craig Guiller <craig.guiller@oracle.com> - 1:9.0.87-5.3
+- Resolves:
+  tomcat: http/2 "MadeYouReset" DoS attack through HTTP/2 control frames (CVE-2025-48989)
+- Resolves:
+  tomcat: Apache Commons FileUpload DOS via part headers (CVE-2025-48976)
+- Resolves:
+  tomcat: Dos in multipart upload (CVE-2025-48988)
+- Resolves:
+  tomcat: Security constraint bypass for pre/post-resources (CVE-2025-49125)
+- Resolves:
+  tomcat: Denial of service (CVE-2025-52434)
+- Resolves:
+  tomcat: Denial of service (CVE-2025-52520)
+- Resolves:
+  tomcat: Denial of service (CVE-2025-53506)
+
 * Wed Jul 16 2025 Pooja Senthil Kumar <pooja.senthil.kumar@oracle.com> - 1:9.0.87-5.1
 - Resolves: RHEL-91765
   tomcat: DoS via malformed HTTP/2 PRIORITY_UPDATE frame (CVE-2025-31650)
diff --git a/sources b/sources
deleted file mode 100644
index 7a0d3a5..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (tomcat-9.0.87.redhat-00010-src.zip) = fd65e91c2fd11d48396692e0e88fbba8c2025ec35cbefb29b9b192c516af958ad357a1232e21abd262187d14add45b1441c34d3fa76ac40ba0866febbbfb341d