diff --git a/packages/app-mobile/android/app/build.gradle b/packages/app-mobile/android/app/build.gradle
index 06e75debdc1..33ee27c7246 100644
--- a/packages/app-mobile/android/app/build.gradle
+++ b/packages/app-mobile/android/app/build.gradle
@@ -141,8 +141,8 @@ android {
         applicationId "net.cozic.joplin"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 2097654
-		versionName "2.5.3"
+		versionCode 2097655
+		versionName "2.5.4"
 		ndk {
 			abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
 		}
diff --git a/readme/changelog_android.md b/readme/changelog_android.md
index fbde9ac5163..1e8b2fc4314 100644
--- a/readme/changelog_android.md
+++ b/readme/changelog_android.md
@@ -1,5 +1,11 @@
 # Joplin Android app changelog
 
+## [android-v2.5.4](https://github.com/laurent22/joplin/releases/tag/android-v2.5.4) (Pre-release) - 2021-10-31T10:24:30Z
+
+- New: Add padding around beta text editor (365e152)
+- Improved: Capitalise first word of sentence in beta editor (4128be9)
+- Fixed: Do not render very large code blocks to prevent app from freezing (#5593)
+
 ## [android-v2.5.3](https://github.com/laurent22/joplin/releases/tag/android-v2.5.3) (Pre-release) - 2021-10-28T21:47:18Z
 
 - New: Add support for public-private key pairs and improved master password support (#5438)