diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d932467..aa616234 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+#### v0.6.1
+
+ * New feature: Enable Android Backup by default if available and using the password encryption (PR #252)
+ * Bug fix: Fix crash in the manual entry dialog on KitKat
+ * Bug fix: Fix thumbnail generation on KitKat
+ * Thumbnail: Add MediaWiki (PR #246 by @MeLlamoPablo)
+
 #### v0.6.0
 
  * New feature: **HOTP support**
diff --git a/README.md b/README.md
index fdacabda..4b6d9218 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 #  andOTP -  Android OTP Authenticator
 
 [![Build Status](https://travis-ci.org/andOTP/andOTP.svg?branch=master)](https://travis-ci.org/andOTP/andOTP)
-[![Current release](https://img.shields.io/github/release/andOTP/andOTP/all.svg)](https://github.com/andOTP/andOTP/releases/download/v0.6.0/andOTP_v0.6.0.apk)
+[![Current release](https://img.shields.io/github/release/andOTP/andOTP/all.svg)](https://github.com/andOTP/andOTP/releases/download/v0.6.1/andOTP_v0.6.1.apk)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/andotp/localized.svg)](https://crowdin.com/project/andotp)
 [![Chat - Telegram](https://img.shields.io/badge/chat-Telegram-blue.svg)](https://t.me/andOTP)
 [![Chat - Matrix](https://img.shields.io/badge/chat-Matrix-blue.svg)](https://matrix.to/#/#andOTP:matrix.shadowice.org)
diff --git a/app/build.gradle b/app/build.gradle
index 7469aa1a..bf39a2b5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "org.shadowice.flocke.andotp"
         minSdkVersion 19
         targetSdkVersion 27
-        versionCode 21
-        versionName "0.6.0"
+        versionCode 22
+        versionName "0.6.1"
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
@@ -39,7 +39,7 @@ dependencies {
     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.1.2"
+    implementation "com.android.support.constraint:constraint-layout:1.1.3"
     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"