diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a1b7126..e4aaac49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,39 @@
 # Changelog
 
+#### v0.9.0
+
+ * New feature: Option to focus search on start (Issue #654,PR #658 by @mchllngr)
+ * New feature: Option to disable Android sync (Google Drive backup) during initial setup (Issue #620, PR #622 by @RichyHBM)
+ * New feature: Option to automatically unlock the app after the credentials have been auto-filled (PR #657 by @mchllngr)
+ * New feature: Option to globally hide the issuer (Issue #678, PR #758 by @Ullas-Aithal)
+ * New feature: Option for multi-line labels (Issue #699)
+ * New feature: Automatic theme selection for Android 10+ (Issue #394, PR #418 by @Ullas-Aithal)
+ * New feature: Allow editing digits, period and counter for existing entries (Issue #694)
+ * New feature: **mOTP support** (Issue #142, PR #617 by @mantinan)
+ * New feature: Show a warning if the automatic time setting is disable on the phone (Issue #285 and #777)
+ * New feature: Share OTP token as keystrokes (PR #693 by @DanielWeigl)
+ * New feature: Option to show previous token (Issue #506)
+ * Improvement: Perform authentication in the background to improve responsiveness (Issue #635, PR #738 by @jsoberg)
+ * Improvement: Backups are now performed in background tasks to improve responsiveness and work around problems with some storage providers (e.g. Nextcloud)
+ * Improvement: Show simple instructions and hide the timeout bar if there are no accounts (Issue #745 and #746, PR #747 by @Ullas-Aithal)
+ * Improvement: Pressing ENTER on a physical keyboard now finishes certain tasks (Issue #590, PR #661 by @mchllngr)
+ * Improvement: Use a font with slashed zero for the account secrets (Issue #665, PR #772 by @Ullas-Aithal)
+ * Improvement: Auto-select the thumbnail if the name appears as part of the issuer (Issue #685, PR #687 by @mavit)
+ * Improvement: Force a minimum password length for backups (Issue #770, PR #771 by @Ullas-Aithal)
+ * Improvement: Automatically update the thumbnail when changing the issuer of an entry (Issue #553)
+ * Improvement: Try harder to decode QR codes from images (Issue #790, PR #792 by @ziegenberg)
+ * Improvement: Perform a short benchmark to determine the iterations to use for unlocking the database (Issue #778)
+ * Bugfix: Switch keyboard when changing auth type during setup (Issue #740, PR #741 by @jsoberg)
+ * Bugfix: Show correct message on password mismatch during setup (PR #774 by @brainynai)
+ * Bugfix: Validate password before saving settings during setup to avoid empty passwords (Issue #593)
+ * Internal: Performance and stability improvements for the main token list (fixes #346 as well)
+ * Internal: Upgrade Gradle, build tools and dependencies
+ * Internal: Perform key-generation during setup in a background task
+ * Internal: Perform credentials change in the settings in a background task
+ * Internal: Perform encryption change in the settings in a background task
+ * Internal: Use our own NumberPickerPreference class
+ * Thumbnails: LOTS of new thumbnails (thanks to all contributors)
+
 #### v0.8.0
 
  * New feature: **Storage Access Framework** (remove all manual storage permissions and use the SAF everywhere)
diff --git a/README.md b/README.md
index 9a8b682d..8f1740de 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.8.0/andOTP_v0.8.0.apk)
+[![Current release](https://img.shields.io/github/release/andOTP/andOTP/all.svg)](https://github.com/andOTP/andOTP/releases/download/v0.9.0-beta1/andOTP_v0.9.0-beta1.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:privacytools.io)
diff --git a/app/build.gradle b/app/build.gradle
index 71774401..1fb4133a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "org.shadowice.flocke.andotp"
         minSdkVersion 22
         targetSdkVersion 30
-        versionCode 35
-        versionName "0.8.0"
+        versionCode 36
+        versionName "0.9.0-beta1"
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }