diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31c3a6b84..6e0e473c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### Version 1.21.0
+* Inline player for audio messages
+* Stronger compression for long videos
+* Long press the 'add back' button to show block menu
+
 ### Version 1.20.1
 * fixed OTR encrypted file transfer
 
diff --git a/build.gradle b/build.gradle
index 755b37981..c12fc522e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,8 +62,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 235
-        versionName "1.21.0-beta"
+        versionCode 236
+        versionName "1.21.0"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
     }