diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f8095c3c..0c18df0e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,16 @@
 Change Log
 ---
 
+### 6.0.5 (2018-04-26)
+
+* Fix crash when deleting 1000+ tasks at once
+* Fix hidden dates in date picker
+* Fix crash on bad response from billing client
+* Report crash when database fails to open
+* Update translations
+  * Dutch - revdbrink
+  * German - marmo
+
 ### 6.0.4 (2018-04-25)
 
 * Fix crash caused by leftover Google Analytics campaign tracker
diff --git a/app/build.gradle b/app/build.gradle
index 866c1e777..242c64032 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,8 +20,8 @@ android {
     defaultConfig {
         testApplicationId "org.tasks.test"
         applicationId "org.tasks"
-        versionCode 530
-        versionName "6.0.4"
+        versionCode 531
+        versionName "6.0.5"
         targetSdkVersion 27
         minSdkVersion 15
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1a4f45a88..eb825fd39 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -420,7 +420,7 @@
 	<string name="delete_multiple_tasks_confirmation">%s gelöscht</string>
 	<string name="delete_selected_tasks">Ausgewählte Aufgaben löschen?</string>
 	<string name="copy_selected_tasks">Ausgewählte Aufgaben kopieren?</string>
-	<string name="date_and_time">Tag und Uhrzeit</string>
+	<string name="date_and_time">Datum und Uhrzeit</string>
 	<string name="start_of_week">Beginn der Woche</string>
 	<string name="use_locale_default">Aus Systemeinstellungen</string>
 	<string name="use_native_datetime_pickers">Datum- und Zeitauswahl des Systems benutzen</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index c63fbaee2..4fe6daca3 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -156,6 +156,7 @@
 	<string name="gcal_completed_title">%s (voltooid)</string>
 	<string name="CFC_gtasks_list_text">In lijst: ?</string>
 	<string name="CFC_gtasks_list_name">In GTasks lijst...</string>
+	<string name="CFC_caldav_list_name">In CalDAV lijst...</string>
 	<string name="gtasks_GTA_clear_completed">Verwijderen Voltooid</string>
 	<string name="gtasks_GLA_authenticating">Verifiëren...</string>
 	<string name="gtasks_GLA_errorIOAuth">Sorry, we konden geen verbinding maken met de servers van Google. Probeer het later opnieuw.</string>
@@ -347,6 +348,7 @@
 	<string name="list_settings">Lijst instellingen</string>
 	<string name="delete">Verwijder</string>
 	<string name="copy">Kopiëer</string>
+	<string name="move">Verplaats</string>
 	<string name="filter_settings">Filter instellingen</string>
 	<string name="show_hidden">Toon verborgen</string>
 	<string name="show_completed">Toon voltooide</string>
@@ -479,6 +481,7 @@
 	<string name="refresh_purchases">Vernieuw aankopen</string>
 	<string name="button_subscribed">Aangemeld</string>
 	<string name="button_subscribe">Aanmelden</string>
+	<string name="button_more_info">Meer informatie</string>
 	<string name="owned">Beheerd</string>
 	<string name="error_billing_unavailable">Betaling onmogelijk. Zorg dat de Google Pay app goed is ingesteld</string>
 	<string name="error_billing_default">Betaling onmogelijk. Controleer je apparaat.</string>
@@ -488,4 +491,9 @@
 	<string name="pro_caldav_sync">CalDAV synchroniseren</string>
 	<string name="pro_multiple_google_task_accounts">Meerdere Google Task accounts</string>
 	<string name="pro_dashclock_extension">Dashclock extentie</string>
+	<string name="requires_pro_subscription">Pro aanmelding vereist</string>
+	<string name="logout">Uitloggen</string>
+	<string name="logout_warning">Uitloggen voor %s? Alle data voor dit account zal worden verwijderd van je toestel</string>
+	<string name="cannot_access_account">Geen toegang tot account</string>
+	<string name="reinitialize_account">Herinitialiseren</string>
 </resources>
\ No newline at end of file