diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4aaac49..79b17b3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,10 @@
  * 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)
+ * Bugfix: Fix scanning QR codes on Android 11+ (Issue #806, PR #807 by @ziegenberg)
+ * Bugfix: Fix OpenKeychain detection on Android 11+ (Issue #825)
+ * Bugfix: Don't require authentication after attaching a physical keyboard (Issue #592)
+ * Bugfix: Fix crash during thumbnail selection with empty issuer
  * 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
diff --git a/README.md b/README.md
index 8f1740de..434a76bb 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.9.0-beta1/andOTP_v0.9.0-beta1.apk)
+[![Current release](https://img.shields.io/github/release/andOTP/andOTP/all.svg)](https://github.com/andOTP/andOTP/releases/download/v0.9.0-beta2/andOTP_v0.9.0-beta2.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 9faf855c..035d2610 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "org.shadowice.flocke.andotp"
         minSdkVersion 22
         targetSdkVersion 30
-        versionCode 36
-        versionName "0.9.0-beta1"
+        versionCode 37
+        versionName "0.9.0-beta2"
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }