diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc2eb2e2c..91ff045d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,37 @@
 # Changelog
 
+## 2.6.3 (2020-01-12)
+
+### Added
+
+- Support Argon2id KDF [#5778]
+- Support XMLv2 key files [#5798]
+
+### Changed
+
+- Improve CSV Import/Export, include time fields and TOTP [#5346]
+- Support empty area dragging of the application window [#5860]
+- Display default Auto-Type sequence in preview pane [#5654]
+- Remove strict length limit on generated passwords [#5748]
+- Hide key file path by default when unlocking database [#5779]
+- Document browser extension use with Edge in managed mode [#5692]
+- Windows: Prevent clipboard history and cloud sync [#5853]
+- macOS: Update the application icon to Big Sur styling [#5851]
+
+### Fixed
+
+- Re-select previously selected entry on database unlock [#5559]
+- Properly save special character choice in password generator [#5610]
+- Fix crash in browser integration with multiple similar entries [#5653]
+- Remove offset on username field in classic theme [#5788]
+- Ensure entry history is copied when drag/dropping entries and groups [#5817]
+- Close modal dialogs when database is locked [#5820]
+- Prevent crash when KeeShare modifies an entry that is currently being edited [#5827]
+- Improve preview of entry attributes [#5834]
+- Always activate/focus database open dialog preventing mistype [#5878]
+- Reports: fix calculation of average password length [#5862]
+- Linux: Delay startup on login to correct tray icon issues [#5724]
+
 ## 2.6.2 (2020-10-21)
 
 ### Added
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84d05e593..f456b9dcb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,7 +101,7 @@ endif()
 
 set(KEEPASSXC_VERSION_MAJOR "2")
 set(KEEPASSXC_VERSION_MINOR "6")
-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 84d52f279..135b37b78 100644
--- a/share/linux/org.keepassxc.KeePassXC.appdata.xml
+++ b/share/linux/org.keepassxc.KeePassXC.appdata.xml
@@ -50,6 +50,33 @@
     </screenshots>
 
     <releases>
+        <release version="2.6.3" date="2021-01-12">
+            <description>
+                <ul>
+                    <li>Support Argon2id KDF [#5778]</li>
+                    <li>Support XMLv2 key files [#5798]</li>
+                    <li>Improve CSV Import/Export, include time fields and TOTP [#5346]</li>
+                    <li>Support empty area dragging of the application window [#5860]</li>
+                    <li>Display default Auto-Type sequence in preview pane [#5654]</li>
+                    <li>Remove strict length limit on generated passwords [#5748]</li>
+                    <li>Hide key file path by default when unlocking database [#5779]</li>
+                    <li>Document browser extension use with Edge in managed mode [#5692]</li>
+                    <li>Windows: Prevent clipboard history and cloud sync [#5853]</li>
+                    <li>macOS: Update the application icon to Big Sur styling [#5851]</li>
+                    <li>Re-select previously selected entry on database unlock [#5559]</li>
+                    <li>Properly save special character choice in password generator [#5610]</li>
+                    <li>Fix crash in browser integration with multiple similar entries [#5653]</li>
+                    <li>Remove offset on username field in classic theme [#5788]</li>
+                    <li>Ensure entry history is copied when drag/dropping entries and groups [#5817]</li>
+                    <li>Close modal dialogs when database is locked [#5820]</li>
+                    <li>Prevent crash when KeeShare modifies an entry that is currently being edited [#5827]</li>
+                    <li>Improve preview of entry attributes [#5834]</li>
+                    <li>Always activate/focus database open dialog preventing mistype [#5878]</li>
+                    <li>Reports: fix calculation of average password length [#5862]</li>
+                    <li>Linux: Delay startup on login to correct tray icon issues [#5724]</li>
+                </ul>
+            </description>
+        </release>
         <release version="2.6.2" date="2020-10-21">
             <description>
                 <ul>
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 90a369d35..898382171 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: keepassxc
-version: 2.6.2
+version: 2.6.3
 grade: stable
 summary: Community-driven port of the Windows application “KeePass Password Safe”
 description: |