diff --git a/k9mail/build.gradle b/k9mail/build.gradle
index 479d1641542..6b285a81a80 100644
--- a/k9mail/build.gradle
+++ b/k9mail/build.gradle
@@ -54,7 +54,7 @@ android {
         testApplicationId "com.fsck.k9.tests"
 
         versionCode 25000
-        versionName '5.500-SNAPSHOT'
+        versionName '5.500'
 
         minSdkVersion 15
         targetSdkVersion 22
diff --git a/k9mail/src/main/res/xml/changelog_master.xml b/k9mail/src/main/res/xml/changelog_master.xml
index 226f434b325..82d46552868 100644
--- a/k9mail/src/main/res/xml/changelog_master.xml
+++ b/k9mail/src/main/res/xml/changelog_master.xml
@@ -8,22 +8,19 @@
      They are automatically updated with "ant bump-version".
 -->
 <changelog>
-    <release version="5.500" versioncode="23700">
-        <change>Import/Export maintain account ordering</change>
-        <change>Improvements to HTML sanitisation mechanism</change>
-        <change>IMAP message sync improvements</change>
-        <change>Further improvements to encryption UX</change>
-        <change>Forward-as-attachment feature</change>
-        <change>Adding option for limiting push connections to 5</change>
-        <change>Altered identity prioritisation</change>
+    <release version="5.500" versioncode="25000">
+        <change>Further improvements to encryption user experience</change>
+        <change>Added ability to forward a message as attachment</change>
+        <change>Improved the way we display text/plain messages</change>
         <change>Improved rendering of RTL text</change>
+        <change>Import/Export maintain account ordering</change>
+        <change>Altered identity prioritization</change>
+        <change>Added option for limiting push connections to 5</change>
         <change>Added SMTP hostname privacy option</change>
-        <change>Added ability to show email address during composition</change>
-        <change>Removed IMAP namespace prefix from folder names</change>
-        <change>Fixed Mailsploit bug</change>
-        <change>Fixed bug when adding recipients during composition</change>
+        <change>Fixed bug that caused draft messages to be lost</change>
         <change>Fixed bug relating to encrypted attached emails</change>
-        <change>Fixed various typos</change>
+        <change>Updated translations</change>
+        <change>More bug fixes</change>
     </release>
     <release version="5.403" versioncode="23630">
         <change>Fixed bug that caused 'Quiet Time' to behave erratically</change>