diff --git a/k9mail/build.gradle b/k9mail/build.gradle
index 474339e6177..cd66914a70a 100644
--- a/k9mail/build.gradle
+++ b/k9mail/build.gradle
@@ -56,8 +56,8 @@ android {
         applicationId "com.fsck.k9"
         testApplicationId "com.fsck.k9.tests"
 
-        versionCode 23540
-        versionName '5.304'
+        versionCode 23600
+        versionName '5.400'
 
         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 e8dca413e07..393e5e0e98c 100644
--- a/k9mail/src/main/res/xml/changelog_master.xml
+++ b/k9mail/src/main/res/xml/changelog_master.xml
@@ -8,6 +8,11 @@
      They are automatically updated with "ant bump-version".
 -->
 <changelog>
+    <release version="5.400" versioncode="23600">
+        <change>Avoid crash on Android 8.1</change>
+        <change>Updated translations</change>
+        <change>Added Albanian translation</change>
+    </release>
     <release version="5.304" versioncode="23540">
         <change>Fixed bug that could cause OpenPGP signature verification to fail when it shouldn't</change>
         <change>Updated translations</change>