From a4a8adcb49f44c2dc27e814c506bb1f0a8ee3eb5 Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Date: Fri, 22 May 2026 16:49:43 +0200
Subject: [PATCH] update CHANGELOG and bump version to 6.26.0

---
 CHANGELOG.asciidoc          | 11 +++++++++++
 docs/release-notes/index.md | 10 ++++++++++
 elasticapm/version.py       |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 5a6bed978..cc9f42d80 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -32,6 +32,17 @@ endif::[]
 [[release-notes-6.x]]
 === Python Agent version 6.x
 
+[[release-notes-6.26.0]]
+==== 6.26.0 - 2026-05-22
+
+[float]
+===== Bug fixes
+
+* Remove usage of modules and patterns deprecated on recent Python versions {pull}2531[#2531]
+* Avoid warnings reading recent Flask versions {pull}2635[#2635]
+* Add back instrumentation of the connection object with ``psycopg[pool]`` {pull}2460[#2460]
+* Fix GRPC target reporting when it does not contain the port {pull}2584[#2584]
+
 [[release-notes-6.25.0]]
 ==== 6.25.0 - 2025-12-23
 
diff --git a/docs/release-notes/index.md b/docs/release-notes/index.md
index d29cec09c..7dd4f2109 100644
--- a/docs/release-notes/index.md
+++ b/docs/release-notes/index.md
@@ -26,6 +26,16 @@ To check for security updates, go to [Security announcements for the Elastic sta
 
 % ### Fixes [elastic-apm-python-agent-versionext-fixes]
 
+## 6.26.0 [elastic-apm-python-agent-6260-release-notes]
+**Release date:** May 22, 2026
+
+### Fixes [elastic-apm-python-agent-6260-fixes]
+
+* Remove usage of modules and patterns deprecated on recent Python versions [#2531](https://github.com/elastic/apm-agent-python/pull/2531)
+* Avoid warnings reading recent Flask versions [#2635](https://github.com/elastic/apm-agent-python/pull/2635)
+* Add back instrumentation of the connection object with ``psycopg[pool]`` [#2460](https://github.com/elastic/apm-agent-python/pull/2460)
+* Fix GRPC target reporting when it does not contain the port [#2584](https://github.com/elastic/apm-agent-python/pull/2584)
+
 ## 6.25.0 [elastic-apm-python-agent-6250-release-notes]
 **Release date:** December 23, 2025
 
diff --git a/elasticapm/version.py b/elasticapm/version.py
index c55a11c61..04f028a30 100644
--- a/elasticapm/version.py
+++ b/elasticapm/version.py
@@ -28,5 +28,5 @@
 #  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-__version__ = (6, 25, 0)
+__version__ = (6, 26, 0)
 VERSION = ".".join(map(str, __version__))