diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63ccfdee2..92600ef0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ### Changelog
 
-#### Version (next)
+#### Version 0.24.0
 * Fix logs sometimes not containing stacktraces
 * Support periodic database export
 * Support transliteration for Arabic and Farsi
diff --git a/app/build.gradle b/app/build.gradle
index 9f8edcc39..7ab3fad76 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         targetSdkVersion 25
 
         // note: always bump BOTH versionCode and versionName!
-        versionName "0.23.2"
-        versionCode 116
+        versionName "0.24.0"
+        versionCode 117
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index e1b034adb..971b073ee 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.24.0" versioncode="117">
+      <change>Fix logs sometimes not containing stacktraces</change>
+      <change>Support periodic database export</change>
+      <change>Support transliteration for Arabic and Farsi</change>
+      <change>Try to make alarm details scrollable (for small devices)</change>
+      <change>Amazfit Bip: Implement find phone feature</change>
+      <change>Amazfit Bip: Support flashing latest GPS firmware</change>
+      <change>Amazfit Cor: Support flashing latest firmware</change>
+    </release>
     <release version="0.23.2" versioncode="116">
         <change>Mi Band 1S: Fix sync problem with firmware 4.16.11.15 (probably also Mi Band 1.0.15.0 and Mi Band 1A 5.16.11.15)</change>
         <change>Amazfit Cor: Fix problem with firmware >=1.0.6.27 being detected as Mi Band 2</change>
diff --git a/fastlane/metadata/android/en-US/changelogs/117.txt b/fastlane/metadata/android/en-US/changelogs/117.txt
new file mode 100644
index 000000000..5c56e63da
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/117.txt
@@ -0,0 +1,7 @@
+* Fix logs sometimes not containing stacktraces
+* Support periodic database export
+* Support transliteration for Arabic and Farsi
+* Try to make alarm details scrollable (for small devices)
+* Amazfit Bip: Implement find phone feature
+* Amazfit Bip: Support flashing latest GPS firmware
+* Amazfit Cor: Support flashing latest firmware