diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e7868c10..97ecd5685 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,41 @@
 # Changelog
 
+## 2.5.2 (2020-01-04)
+
+### Added
+
+- Browser: Show UI warning when entering invalid URLs [#3912]
+- Browser: Option to use an entry only for HTTP auth [#3927]
+
+### Changed
+
+- Disable the user interface when merging or saving the database [#3991]
+- Ability to hide protected attribute after reveal [#3877]
+- Remove mention of "snaps" in Windows and macOS [#3879]
+- CLI: Merge parameter for source database key file (--key-file-from) [#3961]
+- Improve GUI tests reliability on Hi-DPI displays [#4075]
+- Disable deprecation warnings to allow building with Qt 5.14+ [#4075]
+- OPVault: Use 'otp' attribute for TOTP field imports [#4075]
+
+### Fixed
+
+- Fix crashes when saving a database to cloud storage [#3991]
+- Fix crash when pressing enter twice while opening database [#3885]
+- Fix handling of HTML when displayed in the entry preview panel [#3910]
+- Fix start minimized to tray on Linux [#3899]
+- Fix Auto Open with key file only databases [#4075]
+- Fix escape key closing the standalone password generator [#3892]
+- macOS: Fix monospace font usage in password field and notes [#4075]
+- macOS: Fix building on macOS 10.9 to 10.11 [#3946]
+- Fix TOTP setup dialog not closing on database lock [#4075]
+- Browser: Fix condition where additional URLs are ignored [#4033]
+- Browser: Fix subdomain matching to return only relevant site entries [#3854]
+- Secret Service: Fix multiple crashes and incompatibilities [#3871, #4009, #4074]
+- Secret Service: Fix searching of entries [#4008, #4036]
+- Secret Service: Fix behavior when exposed group is recycled [#3914]
+- CLI: Release the database instance before exiting interactive mode [#3889]
+- Fix (most) memory leaks in tests [#3922]
+
 ## 2.5.1 (2019-11-11)
 
 ### Added
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d7b9a051..c2f9b5bfe 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 "1")
+set(KEEPASSXC_VERSION_PATCH "2")
 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 9d3f76d87..e1fe39936 100644
--- a/share/linux/org.keepassxc.KeePassXC.appdata.xml
+++ b/share/linux/org.keepassxc.KeePassXC.appdata.xml
@@ -50,6 +50,37 @@
     </screenshots>
 
     <releases>
+        <release version="2.5.2" date="2020-01-04">
+            <description>
+                <ul>
+                    <li>Browser: Show UI warning when entering invalid URLs [#3912]</li>
+                    <li>Browser: Option to use an entry only for HTTP auth [#3927]</li>
+                    <li>Disable the user interface when merging or saving the database [#3991]</li>
+                    <li>Ability to hide protected attribute after reveal [#3877]</li>
+                    <li>Remove mention of "snaps" in Windows and macOS [#3879]</li>
+                    <li>CLI: Merge parameter for source database key file (--key-file-from) [#3961]</li>
+                    <li>Improve GUI tests reliability on Hi-DPI displays [#4075]</li>
+                    <li>Disable deprecation warnings to allow building with Qt 5.14+ [#4075]</li>
+                    <li>OPVault: Use 'otp' attribute for TOTP field imports [#4075]</li>
+                    <li>Fix crashes when saving a database to cloud storage [#3991]</li>
+                    <li>Fix crash when pressing enter twice while opening database [#3885]</li>
+                    <li>Fix handling of HTML when displayed in the entry preview panel [#3910]</li>
+                    <li>Fix start minimized to tray on Linux [#3899]</li>
+                    <li>Fix Auto Open with key file only databases [#4075]</li>
+                    <li>Fix escape key closing the standalone password generator [#3892]</li>
+                    <li>macOS: Fix monospace font usage in password field and notes [#4075]</li>
+                    <li>macOS: Fix building on macOS 10.9 to 10.11 [#3946]</li>
+                    <li>Fix TOTP setup dialog not closing on database lock [#4075]</li>
+                    <li>Browser: Fix condition where additional URLs are ignored [#4033]</li>
+                    <li>Browser: Fix subdomain matching to return only relevant site entries [#3854]</li>
+                    <li>Secret Service: Fix multiple crashes and incompatibilities [#3871, #4009, #4074]</li>
+                    <li>Secret Service: Fix searching of entries [#4008, #4036]</li>
+                    <li>Secret Service: Fix behavior when exposed group is recycled [#3914]</li>
+                    <li>CLI: Release the database instance before exiting interactive mode [#3889]</li>
+                    <li>Fix (most) memory leaks in tests [#3922]</li>
+                </ul>
+            </description>
+        </release>
         <release version="2.5.1" date="2019-11-11">
             <description>
                 <ul>
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index f438f689b..2c22418f2 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: keepassxc
-version: 2.5.1
+version: 2.5.2
 grade: stable
 summary: Community-driven port of the Windows application “KeePass Password Safe”
 description: |