diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81966738..932ff37a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 ### Changelog
 
+#### Version 0.21.4
+* Mi2/Bip: Fix sleep detection for newer firmwares
+* Mi2/Bip: Fix ancient bug resulting in wrong activity data at the beginning in diagrams and aggregate data
+* No.1 F1: Support setting time format and distance units (metric/imperial)
+* Pebble: Support setting distance units to miles for Health (need to reactivate Health in App Manager after toogling)
+* HPlus: Make changing distance unit system effective immediately on toggling
+
 #### Version 0.21.3
 * Amazfit Bip: Auto-switch language on connect (English, Simplified Chinese, Traditional Chinese), requires FW 0.0.9.14+
 
diff --git a/app/build.gradle b/app/build.gradle
index a839c749..c0a5d5c3 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.21.3"
-        versionCode 104
+        versionName "0.21.5"
+        versionCode 105
         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 53349e5a..2785d3ac 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.21.4" versioncode="105">
+        <change>Mi2/Bip: Fix sleep detection for newer firmwares</change>
+        <change>Mi2/Bip: Fix ancient bug resulting in wrong activity data at the beginning in diagrams and aggregate data</change>
+        <change>No.1 F1: Support setting time format and distance units (metric/imperial)</change>
+        <change>Pebble: Support setting distance units to miles for Health (need to reactivate Health in App Manager after toogling)</change>
+        <change>HPlus: Make changing distance unit system effective immediately on toggling</change>
+    </release>
     <release version="0.21.3" versioncode="104">
         <change>Amazfit Bip: Auto-switch language on connect (English, Simplified Chinese, Traditional Chinese), requires FW 0.0.9.14+</change>
     </release>
diff --git a/fastlane/metadata/android/en-US/changelogs/105.txt b/fastlane/metadata/android/en-US/changelogs/105.txt
new file mode 100644
index 00000000..764af9a1
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/105.txt
@@ -0,0 +1,5 @@
+* Mi2/Bip: Fix sleep detection for newer firmwares
+* Mi2/Bip: Fix ancient bug resulting in wrong activity data at the beginning in diagrams and aggregate data
+* No.1 F1: Support setting time format and distance units (metric/imperial)
+* Pebble: Support setting distance units to miles for Health (need to reactivate Health in App Manager after toogling)
+* HPlus: Make changing distance unit system effective immediately on toggling