diff --git a/CHANGELOG.md b/CHANGELOG.md
index 784d2e82a..2802fdf1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 ### Changelog
 
+#### Version 0.21.0 (next)
+* Initial NO.1 F1 support
+* Amazfit Bip: Display GPS firmware version
+* Amazfit Bip: Fix E-Mail notifications
+* Pebble: Fix crash when takeing screenshots on Android 8.0 (Oreo)
+* Pebble: Support some google app icons
+* Pebble: try to support spotify
+* Fix language being reset to system default
+
 #### Version 0.20.2
 * Amazfit Bip: Various fixes regarding weather, add condition string support for FW 0.0.8.74
 * Amazfit Bip: enable caller display in later firmwares
diff --git a/app/build.gradle b/app/build.gradle
index 06027cc0f..a9dff3d8a 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.20.2"
-        versionCode 100
+        versionName "0.21.0"
+        versionCode 101
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {