diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000000..4bc771127b
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,2 @@
+org.gradle.jvmargs=-Xmx1g
+org.gradle.jvmargs=-Xmx1g
diff --git a/metadata/com.fsck.k9.yml b/metadata/com.fsck.k9.yml
index 2cd9e01c58..073a946494 100644
--- a/metadata/com.fsck.k9.yml
+++ b/metadata/com.fsck.k9.yml
@@ -477,13 +477,17 @@ Builds:
   - versionName: '5.701'
     versionCode: 27001
     commit: '5.701'
-    subdir: app/k9mail
     gradle:
       - yes
+    output: app/k9mail/build/outputs/apk/release/k9mail-release-unsigned.apk
     rm:
       - tools/android-studio/settings.jar
     prebuild: echo 'org.gradle.jvmargs=-Xmx1g' >> ../../gradle.properties
 
+MaintainerNotes: |-
+    Use output instead of subdir to make gradlew-fdroid correctly determine the gradle version to be used.
+    It doesn't work when using subdir because we are two levels deep into thedirectory structure.
+
 AutoUpdateMode: Version %v
 UpdateCheckMode: RepoManifest/5.6-MAINT
 CurrentVersion: '5.600'