diff --git a/src/changelog/2.25.5/.release-notes.adoc.ftl b/src/changelog/2.25.5/.release-notes.adoc.ftl
new file mode 100644
index 00000000000..11e41f27be4
--- /dev/null
+++ b/src/changelog/2.25.5/.release-notes.adoc.ftl
@@ -0,0 +1,25 @@
+////
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+////
+
+[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
+== ${release.version}
+
+<#if release.date?has_content>Release date:: ${release.date}
+
+This patch release delivers certain fixes on top of `2.25.4`
+
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/2.25.5/.release.xml b/src/changelog/2.25.5/.release.xml
new file mode 100644
index 00000000000..6dfdec50305
--- /dev/null
+++ b/src/changelog/2.25.5/.release.xml
@@ -0,0 +1,21 @@
+
+
+
diff --git a/src/changelog/2.25.5/LOG4J2-2006_Fix_RollingFileAppender_createOnDemand.xml b/src/changelog/2.25.5/LOG4J2-2006_Fix_RollingFileAppender_createOnDemand.xml
new file mode 100644
index 00000000000..33d6f9e9fe0
--- /dev/null
+++ b/src/changelog/2.25.5/LOG4J2-2006_Fix_RollingFileAppender_createOnDemand.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+ Fix the `createOnDemand` behavior of `RollingFileAppender` to correctly defer file and directory creation
+ until the first log event, while preserving eager creation when disabled.
+
+
\ No newline at end of file
diff --git a/src/changelog/2.25.5/LOG4J2-4129_Fix_DatePatternConverter_locale_without_timezone.xml b/src/changelog/2.25.5/LOG4J2-4129_Fix_DatePatternConverter_locale_without_timezone.xml
new file mode 100644
index 00000000000..d2c4ff718df
--- /dev/null
+++ b/src/changelog/2.25.5/LOG4J2-4129_Fix_DatePatternConverter_locale_without_timezone.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+ Improve documentation for locale handling in the Pattern Layout date pattern converter
+
+
+
diff --git a/src/changelog/2.25.5/fix-MapMessage-JSON-non-finite-number.xml b/src/changelog/2.25.5/fix-MapMessage-JSON-non-finite-number.xml
new file mode 100644
index 00000000000..d46ebd21333
--- /dev/null
+++ b/src/changelog/2.25.5/fix-MapMessage-JSON-non-finite-number.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ Fix handling of non-finite numbers while encoding `MapMessage` to JSON
+
+
diff --git a/src/changelog/2.25.5/fix-StructuredDataMessage-XML-encoding.xml b/src/changelog/2.25.5/fix-StructuredDataMessage-XML-encoding.xml
new file mode 100644
index 00000000000..ae324c0d21d
--- /dev/null
+++ b/src/changelog/2.25.5/fix-StructuredDataMessage-XML-encoding.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ Fix encoding of `MSGID` and `SD-ID` fields of `StructuredDataMessage` to XML
+
+
diff --git a/src/changelog/2.25.5/fix-circular-reference-detection-for-exceptions-with-colliding.xml b/src/changelog/2.25.5/fix-circular-reference-detection-for-exceptions-with-colliding.xml
new file mode 100644
index 00000000000..63173fdacb7
--- /dev/null
+++ b/src/changelog/2.25.5/fix-circular-reference-detection-for-exceptions-with-colliding.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ Fix stack trace rendering for exceptions with identity malfunction (e.g., colliding `equals()` and/or `hashCode()` implementations)
+
+
diff --git a/src/changelog/2.25.5/fix-log-disruptor-initialization-errors.xml b/src/changelog/2.25.5/fix-log-disruptor-initialization-errors.xml
new file mode 100644
index 00000000000..defea45980e
--- /dev/null
+++ b/src/changelog/2.25.5/fix-log-disruptor-initialization-errors.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ Improve logging for `LinkageError` scenarios involving the LMAX Disruptor library
+
+
diff --git a/src/changelog/2.25.5/fix_configuration_source_url_leak.xml b/src/changelog/2.25.5/fix_configuration_source_url_leak.xml
new file mode 100644
index 00000000000..e7c57d5a1a1
--- /dev/null
+++ b/src/changelog/2.25.5/fix_configuration_source_url_leak.xml
@@ -0,0 +1,8 @@
+
+
+
+ Fix resource leaks in `ConfigurationSource` when loading configuration via URL fails
+
diff --git a/src/changelog/2.25.5/fix_kafka_appender_retry_error_reporting.xml b/src/changelog/2.25.5/fix_kafka_appender_retry_error_reporting.xml
new file mode 100644
index 00000000000..f3884f41e8b
--- /dev/null
+++ b/src/changelog/2.25.5/fix_kafka_appender_retry_error_reporting.xml
@@ -0,0 +1,8 @@
+
+
+
+ Fix `KafkaAppender` reporting error to error handler even after a successful retry
+