diff --git a/CHANGELOG.md b/CHANGELOG.md
index dff420a851..edc4bccab7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ### Changelog
 
-#### NEXT
+#### 0.84.0
 * Initial support for Garmin Fenix 7S Pro / Forerunner 45
 * Initial support for Redmi Buds 6 Active
 * Initial support for Sony WF-C510
diff --git a/app/build.gradle b/app/build.gradle
index aed01afd90..f64355087c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -79,8 +79,8 @@ android {
         minSdkVersion 21
 
         // Note: always bump BOTH versionCode and versionName!
-        versionName "0.83.1"
-        versionCode 236
+        versionName "0.84.0"
+        versionCode 237
         vectorDrawables.useSupportLibrary = true
         buildConfigField "String", "GIT_HASH_SHORT", "\"${getGitHashShort()}\""
         buildConfigField "boolean", "INTERNET_ACCESS", "false"
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 198cade1c1..e7850acce1 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.84.0" versioncode="237">
+        <change>Initial support for Garmin Fenix 7S Pro / Forerunner 45</change>
+        <change>Initial support for Redmi Buds 6 Active</change>
+        <change>Initial support for Sony WF-C510</change>
+        <change>AsteroidOS: Add volume control</change>
+        <change>AsteroidOS: Fix missing sender notification attribute</change>
+        <change>Charts: Add heart rate weekly and monthly tabs</change>
+        <change>Charts: Add option to hide sleep and steps balance</change>
+        <change>Charts: Restore steps balance on weekly and monthly charts</change>
+        <change>Colmi R09: Add preference to toggle temperature measurements</change>
+        <change>Colmi R09: Fix temperature data parsing</change>
+        <change>Colmi R0x: Add support for realtime heart rate meassurements and live activity tracking</change>
+        <change>Garmin: Add custom notification actions</change>
+        <change>Huawei: Add support to set and use canned replies</change>
+        <change>Huawei: Fix calendar event updates</change>
+        <change>Huawei: Fix all day events timezone</change>
+        <change>Huawei: Remove notifications from watch</change>
+        <change>Marstek B2500: Decode more values, add debug section</change>
+        <change>Marstek B2500: Display sensor temperature in Status Activity</change>
+        <change>Marstek B2500: Fix setting pass-though mode</change>
+        <change>Sony Headphones: Allow overriding supported features</change>
+        <change>Sony Headphones: Fix initialization for some devices</change>
+        <change>Sony Headphones: Update default low battery threshold</change>
+        <change>Xiaomi-protobuf: Improve workout parsing</change>
+        <change>Add disabling battery optimizations to permissions screen</change>
+        <change>Fix default date of birth</change>
+        <change>Fix workout parser from incorrect devices being used sometimes</change>
+        <change>Intent API: Allow filtering of BLE characteristics</change>
+        <change>Limit live activity to just the current device</change>
+        <change>Localize notification actions</change>
+        <change>Recognize Fossify SMS / Quik as SMS</change>
+    </release>
     <release version="0.83.1" versioncode="236">
         <change>Initial support for Garmin Fenix 6X Pro Solar</change>
         <change>Initial support for Redmi Buds 4 Active</change>
diff --git a/src/mainline/fastlane/metadata/android/en-US/changelogs/237.txt b/src/mainline/fastlane/metadata/android/en-US/changelogs/237.txt
new file mode 100644
index 0000000000..b09e374c46
--- /dev/null
+++ b/src/mainline/fastlane/metadata/android/en-US/changelogs/237.txt
@@ -0,0 +1,30 @@
+* Initial support for Garmin Fenix 7S Pro / Forerunner 45
+* Initial support for Redmi Buds 6 Active
+* Initial support for Sony WF-C510
+* AsteroidOS: Add volume control
+* AsteroidOS: Fix missing sender notification attribute
+* Charts: Add heart rate weekly and monthly tabs
+* Charts: Add option to hide sleep and steps balance
+* Charts: Restore steps balance on weekly and monthly charts
+* Colmi R09: Add preference to toggle temperature measurements
+* Colmi R09: Fix temperature data parsing
+* Colmi R0x: Add support for realtime heart rate meassurements and live activity tracking
+* Garmin: Add custom notification actions
+* Huawei: Add support to set and use canned replies
+* Huawei: Fix calendar event updates
+* Huawei: Fix all day events timezone
+* Huawei: Remove notifications from watch
+* Marstek B2500: Decode more values, add debug section
+* Marstek B2500: Display sensor temperature in Status Activity
+* Marstek B2500: Fix setting pass-though mode
+* Sony Headphones: Allow overriding supported features
+* Sony Headphones: Fix initialization for some devices
+* Sony Headphones: Update default low battery threshold
+* Xiaomi-protobuf: Improve workout parsing
+* Add disabling battery optimizations to permissions screen
+* Fix default date of birth
+* Fix workout parser from incorrect devices being used sometimes
+* Intent API: Allow filtering of BLE characteristics
+* Limit live activity to just the current device
+* Localize notification actions
+* Recognize Fossify SMS / Quik as SMS