diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4224b4ed5..42fe078ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+### Version 2.5.4
+* stability improvements for group chats and channels
+
 ### Version 2.5.3
 * bug fixes for peer to peer file transfer (Jingle)
 * fixed server info for unlimited/unknown max file size
diff --git a/build.gradle b/build.gradle
index 0dafd2f25..5aad569c6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -81,8 +81,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 332
-        versionName "2.5.4-beta.2"
+        versionCode 333
+        versionName "2.5.4"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId