diff --git a/metadata/com.fsck.k9.yml b/metadata/com.fsck.k9.yml
index a476231079..2fb381ed9a 100644
--- a/metadata/com.fsck.k9.yml
+++ b/metadata/com.fsck.k9.yml
@@ -5,8 +5,8 @@ WebSite: https://k9mail.app/
 SourceCode: https://github.com/k9mail/k-9
 IssueTracker: https://github.com/k9mail/k-9/issues
 Translation: https://www.transifex.com/projects/p/k9mail/
-Changelog: https://k9mail.app/k-9/changelog_5.8-MAINT_branch.xml
-LiberapayID: '34990'
+Changelog: https://k9mail.app/k-9/changelog_6.0-MAINT_branch.xml
+Liberapay: k9mail
 
 AutoName: K-9 Mail
 
@@ -991,11 +991,22 @@ Builds:
       - yes
     output: app/k9mail/build/outputs/apk/release/k9mail-release-unsigned.apk
 
+  - versionName: '6.000'
+    versionCode: 30000
+    commit: '6.000'
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
+    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 ^5\.8[0-9]{2}$
-CurrentVersion: '5.807'
-CurrentVersionCode: 28007
+UpdateCheckMode: Tags ^6\.0[0-9]{2}$
+CurrentVersion: '6.000'
+CurrentVersionCode: 30000