diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml
index e191622..658fd36 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="647"
-    android:versionName="10.5.3-aosp" >
+    android:versionCode="648"
+    android:versionName="10.5.4-aosp" >
 
     <uses-sdk
         android:minSdkVersion="16"
diff --git a/oeffi/CHANGES b/oeffi/CHANGES
index e3a2509..eb84899 100644
--- a/oeffi/CHANGES
+++ b/oeffi/CHANGES
@@ -1,3 +1,7 @@
+v10.5.4
+
+* Require Gradle 4.4 (or later) for building.
+
 v10.5.2-v10.5.3
 
 * Move directions form out of the way if query history is scrolled.
diff --git a/public-transport-enabler b/public-transport-enabler
index 61cba81..361407e 160000
--- a/public-transport-enabler
+++ b/public-transport-enabler
@@ -1 +1 @@
-Subproject commit 61cba8193e913f471574ef45473ee1f73e5f4ce0
+Subproject commit 361407ebf23090b46209ccdc1a2948b80847aebc