diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97ecd5685..08b5a51e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## 2.5.3 (2020-01-19)
+
+### Fixed
+
+- Fix a possible database lockout when removing a YubiKey from a KDBX 3.1 database [#4147]
+- Fix crash if Auto-Type is performed on a new entry [#4150]
+- Fix crash when all entries are deleted from a group [#4156]
+- Improve the reliability of clipboard clearing on Gnome [#4165]
+- Do not check cmd:// URLs for valid URL syntax anymore [#4172]
+- Prevent unnecessary merges for databases on network shares [#4153]
+- Browser: Prevent native messaging proxy from blocking application shutdown [#4155]
+- Browser: Improve website URL matching [#4134, #4177]
+
+### Added
+
+- Browser: Enable support for Chromium-based Edge Browser [#3359]
+
 ## 2.5.2 (2020-01-04)
 
 ### Added
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2f9b5bfe..ac4c8a9ac 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 "2")
+set(KEEPASSXC_VERSION_PATCH "3")
 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 e1fe39936..f670ebce9 100644
--- a/share/linux/org.keepassxc.KeePassXC.appdata.xml
+++ b/share/linux/org.keepassxc.KeePassXC.appdata.xml
@@ -50,6 +50,20 @@
     </screenshots>
 
     <releases>
+        <release version="2.5.3" date="2020-01-19">
+            <description>
+                <ul>
+                    <li>Fix a possible database lockout when removing a YubiKey from a KDBX 3.1 database [#4147]</li>
+                    <li>Fix crash if Auto-Type is performed on a new entry [#4150]</li>
+                    <li>Fix crash when all entries are deleted from a group [#4156]</li>
+                    <li>Improve the reliability of clipboard clearing on Gnome [#4165]</li>
+                    <li>Do not check cmd:// URLs for valid URL syntax anymore [#4172]</li>
+                    <li>Prevent unnecessary merges for databases on network shares [#4153]</li>
+                    <li>Browser: Prevent native messaging proxy from blocking application shutdown [#4155]</li>
+                    <li>Browser: Improve website URL matching [#4134, #4177]</li>
+                </ul>
+            </description>
+        </release>
         <release version="2.5.2" date="2020-01-04">
             <description>
                 <ul>
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 2c22418f2..d30349ae6 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: keepassxc
-version: 2.5.2
+version: 2.5.3
 grade: stable
 summary: Community-driven port of the Windows application “KeePass Password Safe”
 description: |