diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c3f6d8b6..24db62986 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ### Changelog
 
+#### Version 0.21.6
+* Amazfit Bip: Fix non-working notifications from Outlook, Yahoo Mail and GMail
+* HPlus: Fix Unicode encoding
+* No.1 F1: Alarms support
+* No.1 F1: Show data fetching progress
+
 #### Version 0.21.5
 * Mi2/Bip: Support setting distance units (metric/imperial)
 
diff --git a/app/build.gradle b/app/build.gradle
index 5f52dacf7..ddb0a439c 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.5"
-        versionCode 106
+        versionName "0.21.6"
+        versionCode 107
         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 17d93f446..6db45bc70 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.21.6" versioncode="107">
+        <change>Amazfit Bip: Fix non-working notifications from Outlook, Yahoo Mail and GMail</change>
+        <change>HPlus: Fix Unicode encoding</change>
+        <change>No.1 F1: Alarms support</change>
+        <change>No.1 F1: Show data fetching progress</change>
+    </release>
     <release version="0.21.5" versioncode="106">
         <change>Mi2/Bip: Support setting distance units (metric/imperial)</change>
     </release>
diff --git a/fastlane/metadata/android/en-US/changelogs/107.txt b/fastlane/metadata/android/en-US/changelogs/107.txt
new file mode 100644
index 000000000..1d23aea6f
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/107.txt
@@ -0,0 +1,4 @@
+* Amazfit Bip: Fix non-working notifications from Outlook, Yahoo Mail and GMail
+* HPlus: Fix Unicode encoding
+* No.1 F1: Alarms support
+* No.1 F1: Show data fetching progress