diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08b5a51e2..84c7cd773 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## 2.5.4 (2020-04-09)
+
+### Fixed
+
+- Return keyboard focus after saving database edits [#4287]
+- Windows: Use bare minimum settings in portable version [#4131]
+- Windows: Use SHA256 code signing [#4129]
+- macOS: Fix code signing incompatibility in latest macOS release [#4564] 
+
 ## 2.5.3 (2020-01-19)
 
 ### Fixed
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8375dff7b..dc2681893 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,7 +95,7 @@ endif()
 
 set(KEEPASSXC_VERSION_MAJOR "2")
 set(KEEPASSXC_VERSION_MINOR "5")
-set(KEEPASSXC_VERSION_PATCH "3")
+set(KEEPASSXC_VERSION_PATCH "4")
 set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
 set(OVERRIDE_VERSION "" CACHE STRING "Override the KeePassXC Version for Snapshot builds")
 
diff --git a/share/linux/org.keepassxc.KeePassXC.appdata.xml b/share/linux/org.keepassxc.KeePassXC.appdata.xml
index f670ebce9..872c158c1 100644
--- a/share/linux/org.keepassxc.KeePassXC.appdata.xml
+++ b/share/linux/org.keepassxc.KeePassXC.appdata.xml
@@ -50,6 +50,16 @@
     </screenshots>
 
     <releases>
+        <release version="2.5.4" date="2020-04-09">
+            <description>
+                <ul>
+                    <li>Return keyboard focus after saving database edits [#4287]</li>
+                    <li>Windows: Use bare minimum settings in portable version [#4131]</li>
+                    <li>Windows: Use SHA256 code signing [#4129]</li>
+                    <li>macOS: Fix code signing incompatibility in latest macOS release [#4564]</li>
+                </ul>
+            </description>
+        </release>
         <release version="2.5.3" date="2020-01-19">
             <description>
                 <ul>
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index d30349ae6..4d579dd9e 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: keepassxc
-version: 2.5.3
+version: 2.5.4
 grade: stable
 summary: Community-driven port of the Windows application “KeePass Password Safe”
 description: |