diff --git a/app/k9mail/build.gradle b/app/k9mail/build.gradle
index 20a406a7b22..074462f5344 100644
--- a/app/k9mail/build.gradle
+++ b/app/k9mail/build.gradle
@@ -53,8 +53,8 @@ android {
         applicationId "com.fsck.k9"
         testApplicationId "com.fsck.k9.tests"
 
-        versionCode 35005
-        versionName '6.506-SNAPSHOT'
+        versionCode 35006
+        versionName '6.506'
 
         // Keep in sync with the resource string array 'supported_languages'
         resConfigs "in", "br", "ca", "cs", "cy", "da", "de", "et", "en", "en_GB", "es", "eo", "eu", "fr", "gd", "gl",
diff --git a/app/ui/legacy/src/main/res/raw/changelog_master.xml b/app/ui/legacy/src/main/res/raw/changelog_master.xml
index 2f9331dbfa4..d98bc743449 100644
--- a/app/ui/legacy/src/main/res/raw/changelog_master.xml
+++ b/app/ui/legacy/src/main/res/raw/changelog_master.xml
@@ -5,6 +5,10 @@
      Locale-specific versions are kept in res/raw-<locale qualifier>/changelog.xml.
 -->
 <changelog>
+    <release version="6.506" versioncode="35006" date="2023-02-03">
+        <change>Fixed a crash when displaying a message without any recipients</change>
+        <change>Fetch BCC header when partially downloading a message</change>
+    </release>
     <release version="6.505" versioncode="35005" date="2023-02-01">
         <change>Redesign of the message view screen</change>
         <change>Internal changes</change>
diff --git a/fastlane/metadata/android/en-US/changelogs/35006.txt b/fastlane/metadata/android/en-US/changelogs/35006.txt
new file mode 100644
index 00000000000..effb5fc3b17
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/35006.txt
@@ -0,0 +1,2 @@
+- Fixed a crash when displaying a message without any recipients
+- Fetch BCC header when partially downloading a message