diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d9422ea0..54eea76c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,12 @@ audio focus was lost
 - Refactor music backends into a unified chain of extractors
 - Add bluetooth connection reciever (No functionality in app yet)
 
+## 2.6.4
+
+#### What's Fixed
+- Fixed issue where invalid position values would crash the app
+- Fixed issue where opening the song menu in the genre view would crash the app
+
 ## 2.6.3
 
 #### What's New
diff --git a/README.md b/README.md
index 0e5a7e997..b431e1a3d 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,8 @@
 <h1 align="center"><b>Auxio</b></h1>
 <h4 align="center">A simple, rational music player for android.</h4>
 <p align="center">
-    <a href="https://github.com/oxygencobalt/Auxio/releases/tag/v2.6.3">
-        <img alt="Latest Version" src="https://img.shields.io/static/v1?label=tag&message=v2.6.3&color=0D5AF5">
+    <a href="https://github.com/oxygencobalt/Auxio/releases/tag/v2.6.4">
+        <img alt="Latest Version" src="https://img.shields.io/static/v1?label=tag&message=v2.6.4&color=0D5AF5">
     </a>
     <a href="https://github.com/oxygencobalt/Auxio/releases/">
         <img alt="Releases" src="https://img.shields.io/github/downloads/OxygenCobalt/Auxio/total.svg">
diff --git a/app/build.gradle b/app/build.gradle
index f6e9159e4..abdfff30e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,12 +12,10 @@ android {
 
     defaultConfig {
         applicationId namespace
-        versionName "2.6.3"
-        versionCode 22
+        versionName "2.6.4"
+        versionCode 23
 
         minSdk 21
-        // API 33 is still busted, waiting until the XML element issue is fixed
-        // noinspection OldTargetApi
         targetSdk 33
 
         buildFeatures {
diff --git a/fastlane/metadata/android/en-US/changelogs/23.txt b/fastlane/metadata/android/en-US/changelogs/23.txt
new file mode 100644
index 000000000..c132841f7
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/23.txt
@@ -0,0 +1,3 @@
+Auxio 2.6.0 enables a new, higher-quality form of music scanning, while also heavily improving the playback UI. For more information, For more information, see https://github.com/OxygenCobalt/Auxio/releases/tag/v2.6.0.
+
+This release fixes certain crashes that were identified in the previous version.