diff --git a/app-metadata/net.thunderbird.android/en-US/changelogs/8.txt b/app-metadata/net.thunderbird.android/en-US/changelogs/8.txt
new file mode 100644
index 00000000000..3a2fef6925f
--- /dev/null
+++ b/app-metadata/net.thunderbird.android/en-US/changelogs/8.txt
@@ -0,0 +1,8 @@
+Thunderbird for Android version 8.2, based on K-9 Mail. Changes include:
+- Account initials now use the display name
+- Account icons remain in the same position when selected
+- Help text linking to support page added for Gmail login issues
+- Unified inbox enabled only when multiple accounts are configured
+- Push service now starts reliably when expected
+- Correct default delete message action for QR-imported accounts.
+- Folder drawer updates properly on account configuration changes
\ No newline at end of file
diff --git a/app-thunderbird/build.gradle.kts b/app-thunderbird/build.gradle.kts
index b480e166205..9610b19bdcc 100644
--- a/app-thunderbird/build.gradle.kts
+++ b/app-thunderbird/build.gradle.kts
@@ -20,7 +20,7 @@ android {
         applicationId = "net.thunderbird.android"
         testApplicationId = "net.thunderbird.android.tests"
 
-        versionCode = 7
+        versionCode = 8
         versionName = "8.2"
 
         // Keep in sync with the resource string array "supported_languages"
diff --git a/app-thunderbird/src/main/res/raw/changelog_master.xml b/app-thunderbird/src/main/res/raw/changelog_master.xml
index 9b75f062abd..1bfea55e9c8 100644
--- a/app-thunderbird/src/main/res/raw/changelog_master.xml
+++ b/app-thunderbird/src/main/res/raw/changelog_master.xml
@@ -5,6 +5,15 @@
      Locale-specific versions are kept in res/raw-<locale qualifier>/changelog.xml.
 -->
 <changelog>
+    <release version="8.2" versioncode="8" date="2024-12-09">
+        <change>Account initials now use the display name</change>
+        <change>Account icons remain in the same position when selected</change>
+        <change>Help text linking to support page added for Gmail login issues</change>
+        <change>Unified inbox enabled only when multiple accounts are configured</change>
+        <change>Push service now starts reliably when expected</change>
+        <change>Correct default delete message action for QR-imported accounts.</change>
+        <change>Folder drawer updates properly on account configuration changes</change>
+    </release>
     <release version="8.1" versioncode="5" date="2024-11-06">
         <change>Thunderbird's active development is fully funded by financial contributions from our users. If you're enjoying Thunderbird or believe in our mission, please help support it. In this version we will ask you for your support once you've had the chance to actively use Thunderbird for a while.</change>
         <change>We've fixed one of our top crashes to give you a more stable experience</change>
diff --git a/metadata b/metadata
index cd46587ebb6..96619542228 120000
--- a/metadata
+++ b/metadata
@@ -1 +1 @@
-app-metadata/com.fsck.k9
\ No newline at end of file
+app-metadata/net.thunderbird.android
\ No newline at end of file