diff --git a/build.gradle b/build.gradle
index 9fad8dd3b..ed62a5378 100644
--- a/build.gradle
+++ b/build.gradle
@@ -50,8 +50,8 @@ android {
 
     defaultConfig {
         applicationId "de.dennisguse.opentracks"
-        versionCode 4448
-        versionName "v3.20.2"
+        versionCode 4496
+        versionName "v3.21.0"
 
         buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""
 
diff --git a/fastlane/metadata/android/en-US/changelogs/4496.txt b/fastlane/metadata/android/en-US/changelogs/4496.txt
new file mode 100644
index 000000000..de80c0df2
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/4496.txt
@@ -0,0 +1,19 @@
+v3.21.0: OpenTracks
+
+Changes:
+- While recording: remove idle/non-idle creation of TrackPoints
+- Settings are now in separate folders
+- Opening OpenTracks from notification (while recording) and pressing back opens track list
+- GPX compatibilty: support <speed> for import
+
+Bugfixes:
+- Altitude and distance (from BlE sensor): only reset counters if data was actually stored
+- Import without speed, requires computing speed
+- BLE running sensor not connected, should not be reported as present
+- BLE running sensor: show data while recording
+- Activity type icon was not updated while changing activity
+
+Developer:
+- SharedPrefences via static reference
+- Tests are executed against in-memory database
+- TrackRecordingManager keeps last TrackPoint in memory