diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml
index c799bc4..14f61d1 100644
--- a/oeffi/AndroidManifest.xml
+++ b/oeffi/AndroidManifest.xml
@@ -19,8 +19,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="de.schildbach.oeffi"
-    android:versionCode="652"
-    android:versionName="10.5.8-aosp" >
+    android:versionCode="653"
+    android:versionName="10.5.9-aosp" >
 
     <uses-sdk
         android:minSdkVersion="16"
diff --git a/oeffi/CHANGES b/oeffi/CHANGES
index 542e054..f0b286e 100644
--- a/oeffi/CHANGES
+++ b/oeffi/CHANGES
@@ -1,3 +1,7 @@
+v10.5.9
+
+* Modernized Settings and About screens.
+
 v10.5.8
 
 * Fix for color issue on Android 10.
diff --git a/public-transport-enabler b/public-transport-enabler
index 07a88f4..b1fc17c 160000
--- a/public-transport-enabler
+++ b/public-transport-enabler
@@ -1 +1 @@
-Subproject commit 07a88f442f17467285bbc625866147f80fc1ef2b
+Subproject commit b1fc17c518b8980de23d5b50dee48cb419b95655