diff --git a/packages/app-mobile/android/app/build.gradle b/packages/app-mobile/android/app/build.gradle
index 8ac3e49f3b..83bb34a64f 100644
--- a/packages/app-mobile/android/app/build.gradle
+++ b/packages/app-mobile/android/app/build.gradle
@@ -146,8 +146,8 @@ android {
         applicationId "net.cozic.joplin"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 2097659
-		versionName "2.6.3"
+		versionCode 2097660
+		versionName "2.6.4"
 		ndk {
 			abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
 		}
diff --git a/readme/changelog_android.md b/readme/changelog_android.md
index fe05f78849..06d5a3e863 100644
--- a/readme/changelog_android.md
+++ b/readme/changelog_android.md
@@ -1,5 +1,14 @@
 # Joplin Android app changelog
 
+## [android-v2.6.4](https://github.com/laurent22/joplin/releases/tag/android-v2.6.4) (Pre-release) - 2021-12-01T11:38:49Z
+
+- Improved: Also duplicate resources when duplicating a note (c0a8c33)
+- Improved: Improved S3 sync error handling and reliability, and upgraded S3 SDK (#5312 by Lee Matos)
+- Fixed: Alarm setting buttons were no longer visible (#5777)
+- Fixed: Alarms were not being triggered in some cases (#5798) (#5216 by Roman Musin)
+- Fixed: Fixed opening attachments (6950c40)
+- Fixed: Handle duplicate attachments when the parent notebook is shared (#5796)
+
 ## [android-v2.6.3](https://github.com/laurent22/joplin/releases/tag/android-v2.6.3) (Pre-release) - 2021-11-21T16:59:46Z
 
 - New: Add date format YYYY/MM/DD (#5759 by Helmut K. C. Tessarek)