diff --git a/app-k9mail/build.gradle.kts b/app-k9mail/build.gradle.kts
index a7d7219ad34..f3b62aefb36 100644
--- a/app-k9mail/build.gradle.kts
+++ b/app-k9mail/build.gradle.kts
@@ -34,8 +34,8 @@ android {
         applicationId = "com.fsck.k9"
         testApplicationId = "com.fsck.k9.tests"
 
-        versionCode = 37016
-        versionName = "6.717-SNAPSHOT"
+        versionCode = 37017
+        versionName = "6.717"
 
         // Keep in sync with the resource string array "supported_languages"
         resourceConfigurations.addAll(
diff --git a/app-k9mail/fastlane/metadata/android/en-US/changelogs/37017.txt b/app-k9mail/fastlane/metadata/android/en-US/changelogs/37017.txt
new file mode 100644
index 00000000000..19adff395cc
--- /dev/null
+++ b/app-k9mail/fastlane/metadata/android/en-US/changelogs/37017.txt
@@ -0,0 +1,5 @@
+- Fixed order of autoconfig discovery steps
+- Changed default display count to 100
+- Enabled notifications for new accounts by default
+- Reverted the change to handling mailto: URIs introduced in K-9 Mail 6.716 because of unintended side effects
+- Fixed bug to make "colorize contacts" work again in message view
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 95e28db7d01..0c0e91f1b6d 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,13 @@
      Locale-specific versions are kept in res/raw-<locale qualifier>/changelog.xml.
 -->
 <changelog>
+    <release version="6.717" versioncode="37017" date="2024-02-16">
+        <change>Fixed order of autoconfig discovery steps</change>
+        <change>Changed default display count to 100</change>
+        <change>Enabled notifications for new accounts by default</change>
+        <change>Reverted the change to handling mailto: URIs introduced in K-9 Mail 6.716 because of unintended side effects</change>
+        <change>Fixed bug to make "colorize contacts" work again in message view</change>
+    </release>
     <release version="6.716" versioncode="37016" date="2024-02-13">
         <change>Small bug fixes and UI/UX polish in account setup</change>
         <change>Fixed a crash caused by an interaction with OpenKeychain 6.0.0</change>