diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53a87ee8..c63da839 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+#### v0.6.0
+
+ * New feature: **HOTP support**
+ * New feature: Settings item to activate Broadcast backups
+ * New feature: Re-locking of the app on screen off is now optional (Issue #28)
+ * Bug fix: Avoid crash on empty PIN/Password an API 23 (Issue #159, PR #160 by magnus anderssen)
+ * Internal: Replace custon FAB menu with FABsMenu library (Issue #155)
+ * Style/UI: Use AboutLibraries instead of LicenseDialog and rework the About section (Issue #155)
+ * Update: ZXing Android Embedded (3.6.0), Constraint Layout (1.1.0) and all support libraries (27.1.1)
+ * Thumbnails: new thumbnails (see the wiki)
+
+#### v0.5.1 (Google Play only)
+
+ * Like v0.5.0 but with Password-based encryption offered by default during setup
+
 #### v0.5.0
 
  * New feature: **Intro screen when staring the app for the first time to setup encryption and authentication**
diff --git a/app/build.gradle b/app/build.gradle
index f0f46217..b0e9a897 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "org.shadowice.flocke.andotp"
         minSdkVersion 19
         targetSdkVersion 27
-        versionCode 16
-        versionName "0.5.0.1"
+        versionCode 18
+        versionName "0.6.0-beta1"
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
@@ -32,14 +32,14 @@ android {
 }
 
 dependencies {
-    ext.supportLibVersion = "27.1.0"
+    ext.supportLibVersion = "27.1.1"
 
     implementation "commons-codec:commons-codec:1.11"
     implementation "com.android.support:appcompat-v7:$supportLibVersion"
     implementation "com.android.support:cardview-v7:$supportLibVersion"
     implementation "com.android.support:design:$supportLibVersion"
     implementation "com.android.support:recyclerview-v7:$supportLibVersion"
-    implementation "com.android.support.constraint:constraint-layout:1.0.2"
+    implementation "com.android.support.constraint:constraint-layout:1.1.0"
     implementation "com.github.aakira:expandable-layout:1.6.0"
     implementation "com.heinrichreimersoftware:material-intro:1.6.2"
     implementation "com.journeyapps:zxing-android-embedded:3.6.0"