diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49836cc8a..f5edb604b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Change Log
 
+## [4.0.1] - 2017-04-17
+### Changed
+- Audio recording limit is now 2m on PTT and 5m on audio dialog
+- Improve battery saving in offline mode (#869)
+- Improve app navigation (#961)
+- Fix group member information (#968)
+
+### Fixed
+- Fix audio files downloaded in wrong directory (#952)
+- Fix crash on tablets (#953)
+- Fix PTT crash after reaching time limit (#954)
+- Fix registration error in rare cases (#963)
+- Fix key never marked as trusted (#973)
+- Fix upgrades from older versions (#983)
+- Fix some crash issues (#955, #958, #965, #975, #976, #977)
+
 ## [4.0.0] - 2017-02-12
 ### Changed
 - Groups: button for adding users again (for members losing their messages)
diff --git a/app/src/main/play/ca/whatsnew b/app/src/main/play/ca/whatsnew
index b103c5d07..096bdd305 100644
--- a/app/src/main/play/ca/whatsnew
+++ b/app/src/main/play/ca/whatsnew
@@ -1,6 +1,8 @@
-* Actualització de les banderes de països
-* Solucionat el problema de pujada múltiple de fotos
-* Solucionat l'error de registre a la configuració persa
-* Altres errors solucionats
+Ja tenim els xats en grup! Ajuda'ns a millorar i corregir els errors informant a GitHub o a discutir-los al nou fòrum: https://forum.kontalk.org
 
-Es pot accedir a l'arxiu històric de modificacions a https://github.com/kontalk/androidclient/releases/tag/v3.1.10
\ No newline at end of file
+* el límit de gravació d'àudio és ara de 2m de PTT i 5m de diàleg d'àudio
+* millora en la navegació de l'app
+* augment de l'estalvi de bateria en mode offline
+* correccions de fallades a les tabletes
+* correccions de fallada durant la gravació d'àudio PTT
+* moltes correccions d'errors
\ No newline at end of file
diff --git a/app/src/main/play/de-DE/whatsnew b/app/src/main/play/de-DE/whatsnew
index e5d770aea..dc223ecf5 100644
--- a/app/src/main/play/de-DE/whatsnew
+++ b/app/src/main/play/de-DE/whatsnew
@@ -1,10 +1,9 @@
 Lang erwartete Gruppenchats!
 Helfen Sie uns bei Verbesserungen und Fehlerbehebungen indem Sie Fehlerreports auf Github posten oder in unserem neuen Forum darüber diskutieren: https://forum.kontalk.org
 
-* NEU: Verschlüsselung pro Chat abschaltbar
-* NEU: internes Logsystem zur Fehlersuche
-* NEU: Chats als wichtig markieren
-* NEU: neues Appicon von Giovanni Lauricella
-* besser sortiertes Einstellungsmenü
-* zuverlässigere Anmeldeprozedur
-* viele Fehlerbehebungen und Verbesserungen
\ No newline at end of file
+* Maximale Aufnahmezeit für PTT ist jetzt 2 Minuten und im Audiodialog 5 Minuten 
+* Verbesserte Appnavigation
+* Verbesserter Stromverbrauch im Offlinemodus
+* Abstürze bei Tablets behoben 
+* Abstürze bei PTT-Aufnahmen behoben 
+* viele Fehlerbehebungen
\ No newline at end of file
diff --git a/app/src/main/play/en-US/whatsnew b/app/src/main/play/en-US/whatsnew
index 6c4d522ef..0b4709425 100644
--- a/app/src/main/play/en-US/whatsnew
+++ b/app/src/main/play/en-US/whatsnew
@@ -1,9 +1,8 @@
 Group chats are here! Help us improve and fix bugs by reporting them on GitHub or discussing them on our new forum: https://forum.kontalk.org
 
-* NEW: toggle encryption per chat
-* NEW: internal logging system
-* NEW: sticky conversations
-* NEW: new app icon by Giovanni Lauricella
-* organize preferences by category
-* more reliable registration procedure
-* many bugfixes and lots of minor improvements
\ No newline at end of file
+* audio recording limit is now 2m on PTT and 5m on audio dialog
+* improve app navigation
+* improve battery saving in offline mode
+* fix crash on tablets
+* fix crash while recording PTT audio
+* many bugfixes
\ No newline at end of file
diff --git a/app/src/main/play/es-ES/whatsnew b/app/src/main/play/es-ES/whatsnew
index 041db74c3..955eb1bd3 100644
--- a/app/src/main/play/es-ES/whatsnew
+++ b/app/src/main/play/es-ES/whatsnew
@@ -1,6 +1,8 @@
-* Actualización de las banderas de los países
-* Arreglado la subida múltiple de fotos
-* Arreglado el error de registro en la configuración local Persa
-* Otras correcciones de errores
+Ya tenemos los chats de grupo! Ayúdanos a mejorar y corregir los errores en GitHub y a discutirlos en nuestro nuevo fórum: https://forum.kontalk.org
 
-Se puede acceder al archivo histórico de modificaciones en https://github.com/kontalk/androidclient/releases/tag/v3.1.10
\ No newline at end of file
+* el límite de grabación de audio ahora es de 2m de PTT i 5m de diálogo de audio
+* mejora en la navegación de la app
+* mejora en el consumo de batería en modo offline
+* correcciones de fallos en tabletas
+* correcciones de fallos durante la grabación de audio PTT
+* muchas correcciones de errores
\ No newline at end of file
diff --git a/app/src/main/play/it-IT/whatsnew b/app/src/main/play/it-IT/whatsnew
index d0f190402..2701e2ec3 100644
--- a/app/src/main/play/it-IT/whatsnew
+++ b/app/src/main/play/it-IT/whatsnew
@@ -1,9 +1,8 @@
 Finalmente con le chat di gruppo! Aiutaci a migliorarla e correggere bug segnalandoli su GitHub o discutendoli sul nostro nuovo forum: https://forum.kontalk.org
 
-* NEW: disattiva cifratura per singola chat
-* NEW: sistema di logging interno
-* NEW: conversazioni preferite
-* NEW: nuova icona app by Giovanni Lauricella
-* preferenze riorganizzate per categoria
-* procedura di registrazione più affidabile
-* svariate altre correzioni e miglioramenti vari
\ No newline at end of file
+* limite registrazione audio ora a 2m in PTT e 5m in allegato audio
+* miglioramento navigazione in app
+* miglioramento consumo batteria in modalità offline
+* corretto crash su tablet
+* corretto crash messaggi vocali
+* svariate altre correzioni
\ No newline at end of file
diff --git a/app/src/main/play/nl-NL/whatsnew b/app/src/main/play/nl-NL/whatsnew
index 580d310a5..291f8941a 100644
--- a/app/src/main/play/nl-NL/whatsnew
+++ b/app/src/main/play/nl-NL/whatsnew
@@ -1,8 +1,9 @@
 Groepsgesprekken zijn er! Help ons verbeteringen aan te brengen of bugs op te lossen door ze te rapporteren op GitHub of ons nieuwe forum: https://forum.kontalk.org
 
-* Schakel versleuteling per chat aan of uit
-* Zet favoriete gesprekken vast aan de top van de gesprekkenlijst
-* Nieuw app logo door Giovanni Lauricella
-* Veel bugfixes en kleine verbeteringen
-
-Een gedetailleerd lijst van wijzigingen is beschikbaar op https://github.com/kontalk/androidclient/releases/tag/v4.0.0
\ No newline at end of file
+* NIEUW: schakel versleuteling per chat aan of uit
+* NIEUW: intern logboek
+* NIEUW: zet favoriete gesprekken vast aan de top van de gesprekkenlijst
+* NIEUW: applogo door Giovanni Lauricella
+* rangschik voorkeuren op categorie
+* betrouwbaardere registratieprocedure
+* veel probleemoplossingen en kleine verbeteringen
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index ce824199a..18bb25824 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,8 +20,8 @@ allprojects {
 
     evaluationDependsOn ":client-common-java"
     ext {
-        appVersionCode = 221
-        appVersionName = '4.0.1-preview'
+        appVersionCode = 222
+        appVersionName = '4.0.1'
         targetSdkVersion = 22
         compileSdkVersion = 25
         buildToolsVersion = '25.0.2'