diff --git a/metadata/com.fsck.k9.yml b/metadata/com.fsck.k9.yml
index 26a29a51fd..389d50e3a1 100644
--- a/metadata/com.fsck.k9.yml
+++ b/metadata/com.fsck.k9.yml
@@ -5,7 +5,7 @@ WebSite: https://k9mail.app/
 SourceCode: https://github.com/thundernest/k-9
 IssueTracker: https://github.com/thundernest/k-9/issues
 Translation: https://www.transifex.com/projects/p/k9mail/
-Changelog: https://thundernest.github.io/k-9/changelog_6.2-MAINT_branch.xml
+Changelog: https://thundernest.github.io/k-9/changelog_6.4-MAINT_branch.xml
 Donate: https://give.thunderbird.net/k9mail/
 
 AutoName: K-9 Mail
@@ -1040,11 +1040,18 @@ Builds:
       - yes
     output: app/k9mail/build/outputs/apk/release/k9mail-release-unsigned.apk
 
+  - versionName: '6.400'
+    versionCode: 34000
+    commit: '6.400'
+    gradle:
+      - yes
+    output: app/k9mail/build/outputs/apk/release/k9mail-release-unsigned.apk
+
 MaintainerNotes: |-
     Use output instead of subdir to make gradlew-fdroid correctly determine the gradle version to be used.
     It doesn't work when using subdir because we are two levels deep into the directory structure.
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags ^6\.2[0-9]{2}$
-CurrentVersion: '6.202'
-CurrentVersionCode: 32002
+UpdateCheckMode: Tags ^6\.4[0-9]{2}$
+CurrentVersion: '6.400'
+CurrentVersionCode: 34000