diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4eefae07b3..97b757bdde 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+## 3.0.0 (Jan, xx, 2018)
+
+- End to end encryption
+- Screen adapted images instead of downloading
+- direct access to operations for single files
+- Android 8 support 
+- folder based sort order
+- right to left language support
+- detect walled garden
+- load more activities when reaching end of stream
+- quicker access to share 
+- automatically update avatars
+- auto upload improvements
+- fix push notifications
+- UI enhancements
+- bug fixes
+
 ## 2.0.0 (Oct, 17, 2017)
 
 - Account-wide search (Nc 12+)
diff --git a/build.gradle b/build.gradle
index 6cde77f627..233352cef8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -78,8 +78,8 @@ android {
 
         multiDexEnabled true
 
-        versionCode = 20000099
-        versionName = "2.0.0"
+        versionCode = 30000001
+        versionName = "3.0.0 RC1"
 
         // adapt structure from Eclipse to Gradle/Android Studio expectations;
         // see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure