diff --git a/CHANGELOG.md b/CHANGELOG.md
index f610a4cf..dc14264b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 ###Changelog
 
+####Version 1.17.0
+* Do not notify for messages from strangers by default
+* Blocking a JID closes the corresponding conversation
+* Show message sender in conversation overview
+* Show unread counter for every conversation
+* Support for the latest MAM namespace
+* Icons for attach menu
+
 ####Version 1.16.2
 * change mam catchup strategie. support mam:1
 * bug fixes
diff --git a/build.gradle b/build.gradle
index 361a0878..524281f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,8 +56,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 199
-        versionName "1.16.2"
+        versionCode 200
+        versionName "1.17.0-beta"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
     }