diff --git a/.github/workflows/macos_release.yml b/.github/workflows/macos_release.yml
index 63f789aa..5c25f73e 100644
--- a/.github/workflows/macos_release.yml
+++ b/.github/workflows/macos_release.yml
@@ -10,7 +10,7 @@ jobs:
     name: Build dist with Linux
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 2.5.1
+      RELEASE_VERSION: 2.5.2
     steps:
       - name: checkout
         uses: actions/checkout@v3
@@ -44,7 +44,7 @@ jobs:
           - os: macos-latest-xlarge
             arch: arm
     env:
-      RELEASE_VERSION: 2.5.1
+      RELEASE_VERSION: 2.5.2
       SO_VERSION: 2
     steps:
       - name: Download source from job_1
diff --git a/.github/workflows/windows_release.yml b/.github/workflows/windows_release.yml
index 1374ca63..190c9019 100644
--- a/.github/workflows/windows_release.yml
+++ b/.github/workflows/windows_release.yml
@@ -12,7 +12,7 @@ jobs:
     name: Build dist with Linux
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 2.5.1
+      RELEASE_VERSION: 2.5.2
     steps:
       - name: checkout
         uses: actions/checkout@v2
@@ -40,7 +40,7 @@ jobs:
     needs: job_1
     runs-on: windows-latest
     env:
-      RELEASE_VERSION: 2.5.1
+      RELEASE_VERSION: 2.5.2
     steps:
       - name: Download source from job_1
         uses: actions/download-artifact@v1
@@ -95,7 +95,7 @@ jobs:
     needs: job_1
     runs-on: windows-latest
     env:
-      RELEASE_VERSION: 2.5.1
+      RELEASE_VERSION: 2.5.2
     steps:
       - name: Download source from job_1
         uses: actions/download-artifact@v1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae6654e6..6a261b69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ project (yubico-piv-tool)
 
 set (yubico_piv_tool_VERSION_MAJOR 2)
 set (yubico_piv_tool_VERSION_MINOR 5)
-set (yubico_piv_tool_VERSION_PATCH 1)
+set (yubico_piv_tool_VERSION_PATCH 2)
 set (VERSION "${yubico_piv_tool_VERSION_MAJOR}.${yubico_piv_tool_VERSION_MINOR}.${yubico_piv_tool_VERSION_PATCH}")
 set (SO_VERSION 2)
 
diff --git a/NEWS b/NEWS
index a73c8bd2..bdd37811 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
 yubico-piv-tool NEWS -- History of user-visible changes.        -*- outline -*-
 
+* Version 2.5.2 (released 2024-05-07)
+
+** cmd: Fix signing selfsigned certificate for ED25519 key.
+
 * Version 2.5.1 (released 2024-02-14)
 
 ** ykpiv: cmd: ykcs11: Fix buffer size for key import.
diff --git a/debian/changelog b/debian/changelog
index 6df84745..68170856 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+yubico-piv-tool (2.5.2) stable; urgency=medium
+
+  * cmd: Fix signing selfsigned certificate for ED25519 key.
+
+ -- Aveen Ismail <aveen.ismail@yubico.com>  Mon, 7 May 2024 18:53:10 +0100
+
 yubico-piv-tool (2.5.1) stable; urgency=medium
 
   * ykpiv: cmd: ykcs11: Fix buffer size for key import.
diff --git a/resources/win/yubico-piv-tool_x64.wxs b/resources/win/yubico-piv-tool_x64.wxs
index 447b6679..c87d5d95 100644
--- a/resources/win/yubico-piv-tool_x64.wxs
+++ b/resources/win/yubico-piv-tool_x64.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <?define ProductVersion="2.5.1" ?>
+  <?define ProductVersion="2.5.2" ?>
   <?define ProductName="Yubico PIV Tool (x64)" ?>
 
    <Product Id="*" UpgradeCode="e4f980c4-5dd5-4d39-95b7-c6362ae65be8" Name="$(var.ProductName)" Version="$(var.ProductVersion)" Manufacturer="Yubico AB" Language="1033">
diff --git a/resources/win/yubico-piv-tool_x86.wxs b/resources/win/yubico-piv-tool_x86.wxs
index 4fcb11aa..1036378b 100644
--- a/resources/win/yubico-piv-tool_x86.wxs
+++ b/resources/win/yubico-piv-tool_x86.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <?define ProductVersion="2.5.1" ?>
+  <?define ProductVersion="2.5.2" ?>
   <?define ProductName="Yubico PIV Tool (x86)" ?>
 
    <Product Id="*" UpgradeCode="1aa2f085-add9-4556-9e21-299b078e6273" Name="$(var.ProductName)" Version="$(var.ProductVersion)" Manufacturer="Yubico AB" Language="1033">