diff --git a/app/k9mail/build.gradle.kts b/app/k9mail/build.gradle.kts
index f42d446a2ec..3df6d6c2414 100644
--- a/app/k9mail/build.gradle.kts
+++ b/app/k9mail/build.gradle.kts
@@ -45,8 +45,8 @@ android {
         applicationId = "com.fsck.k9"
         testApplicationId = "com.fsck.k9.tests"
 
-        versionCode = 35011
-        versionName = "6.512-SNAPSHOT"
+        versionCode = 36000
+        versionName = "6.600"
 
         // Keep in sync with the resource string array "supported_languages"
         resourceConfigurations.addAll(
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 8c3629ee6e1..e8dd923c79f 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,15 @@
      Locale-specific versions are kept in res/raw-<locale qualifier>/changelog.xml.
 -->
 <changelog>
+    <release version="6.600" versioncode="36000" date="2023-04-11">
+        <change>Redesigned the message view screen; tap the message header containing sender/recipient names to see more details</change>
+        <change>Added a setting for three different message list densities: compact, default, relaxed</change>
+        <change>Added better support for right-to-left languages when composing messages</change>
+        <change>Search now also considers recipient addresses</change>
+        <change>Fixed a bug where notifications would sometimes reappear shortly after having been dismissed</change>
+        <change>IMAP: Fixed a bug where sometimes authentication errors were silently ignored</change>
+        <change>Various other small bug fixes and improvements; see changes for versions 6.5xx</change>
+    </release>
     <release version="6.511" versioncode="35011" date="2023-03-31">
         <change>Swiping between messages should now work more reliably</change>
         <change>Fixed message details layout when contact pictures are disabled</change>
diff --git a/fastlane/metadata/android/en-US/changelogs/36000.txt b/fastlane/metadata/android/en-US/changelogs/36000.txt
new file mode 100644
index 00000000000..749ad1734bb
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/36000.txt
@@ -0,0 +1,7 @@
+- Redesigned the message view screen; tap the message header containing sender/recipient names to see more details
+- Added a setting for three different message list densities: compact, default, relaxed
+- Added better support for right-to-left languages when composing messages
+- Search now also considers recipient addresses
+- Fixed a bug where notifications would sometimes reappear shortly after having been dismissed
+- IMAP: Fixed a bug where sometimes authentication errors were silently ignored
+- Various other small bug fixes and improvements; see changes for versions 6.5xx