diff --git a/metadata/com.fsck.k9.yml b/metadata/com.fsck.k9.yml
index 948a31c96c..9dd5f1eb2c 100644
--- a/metadata/com.fsck.k9.yml
+++ b/metadata/com.fsck.k9.yml
@@ -6,7 +6,7 @@ SourceCode: https://github.com/thunderbird/thunderbird-android
 IssueTracker: https://github.com/thunderbird/thunderbird-android/issues
 Translation: https://hosted.weblate.org/projects/tb-android/
 Changelog: https://thunderbird.github.io/thunderbird-android/changelog_6.6-MAINT_branch.xml
-Donate: https://mzla.link/k9-give
+Donate: https://mzla.link/supportK9
 
 AutoName: K-9 Mail
 
@@ -1541,6 +1541,22 @@ Builds:
     scandelete:
       - build-plugin/build
 
+  - versionName: '8.2'
+    versionCode: 39019
+    commit: 0f7e096b3b2069ce22a6b0a3deda5db0aa912386
+    gradle:
+      - foss
+    output: app-k9mail/build/outputs/apk/foss/release/app-k9mail-foss-release-unsigned.apk
+    rm:
+      - feature/funding/googleplay
+    prebuild:
+      - sed -i -e '/maven.mozilla.org\/maven2/d' -e '/glean/d' -e '/app-thunderbird/d'
+        -e '/googleplay/d' settings.gradle.kts
+      - sed -i -e 's/feature.funding.googleplay/feature.funding.link/' app-k9mail/build.gradle.kts
+      - gradle clean
+    scandelete:
+      - build-plugin/build
+
 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.
@@ -1548,5 +1564,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '8.1'
-CurrentVersionCode: 39012
+CurrentVersion: '8.2'
+CurrentVersionCode: 39019