diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0400c30ea..9c3f6d8b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ### Changelog
 
+#### Version 0.21.5
+* Mi2/Bip: Support setting distance units (metric/imperial)
+
 #### 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
diff --git a/app/build.gradle b/app/build.gradle
index c0a5d5c32..5f52dacf7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,7 +27,7 @@ android {
 
         // note: always bump BOTH versionCode and versionName!
         versionName "0.21.5"
-        versionCode 105
+        versionCode 106
         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 a1e6745ce..17d93f446 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.21.5" versioncode="106">
+        <change>Mi2/Bip: Support setting distance units (metric/imperial)</change>
+    </release>
     <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>
diff --git a/fastlane/metadata/android/en-US/changelogs/106.txt b/fastlane/metadata/android/en-US/changelogs/106.txt
new file mode 100644
index 000000000..3789f96ca
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/106.txt
@@ -0,0 +1 @@
+* Mi2/Bip: Support setting distance units (metric/imperial)