diff --git a/metadata/org.documentfoundation.libreoffice.txt b/metadata/org.documentfoundation.libreoffice.txt
index d5fc6bb796..2368c837e2 100644
--- a/metadata/org.documentfoundation.libreoffice.txt
+++ b/metadata/org.documentfoundation.libreoffice.txt
@@ -159,6 +159,7 @@ Build:5.2.3.1/01ec8f3,11
 
 Build:6.1.0.0.alpha0+/484d0ea842da,14
     commit=484d0ea842da586a4cf51b6d11683b04f234474c
+    timeout=14400
     subdir=android/source
     gradle=StrippedUI
     srclibs=LOTarballs@e356fc5381dd7aee3ffd47077c7527aa6a6fc0f8
@@ -189,7 +190,8 @@ Build:6.1.0.0.alpha0+/484d0ea842da,14
         cd - && \
         make liboSettings.gradle versionCode=14
     scanignore=workdir/UnpackedTarball/owncloud_android_lib/build/outputs/aar/owncloud_android_lib-release.aar,workdir/UnpackedTarball/owncloud_android_lib/build/outputs/aar/owncloud_android_lib-debug.aar,icon-themes/tango/res/*.png,icon-themes/galaxy/res/*.png,instdir/program/classes/unoloader.jar,instdir/program/classes/ridl.jar,instdir/program/classes/unoil.jar,instdir/program/classes/jurt.jar,instdir/program/classes/juh.jar,instdir/program/classes/java_uno.jar
-    build=ln -s $(which gradle) gradlew && \
+    build=echo 'gradle "$@"' > gradlew && \
+        chmod a+x gradlew && \
         pushd ../../ && \
         rm -r workdir && \
         rm -r instdir && \
@@ -200,6 +202,7 @@ Build:6.1.0.0.alpha0+/484d0ea842da,14
 
 Build:6.1.0.0.alpha0+/484d0ea842da,15
     commit=484d0ea842da586a4cf51b6d11683b04f234474c
+    timeout=14400
     subdir=android/source
     gradle=StrippedUI
     srclibs=LOTarballs@e356fc5381dd7aee3ffd47077c7527aa6a6fc0f8
@@ -230,7 +233,8 @@ Build:6.1.0.0.alpha0+/484d0ea842da,15
         cd - && \
         make liboSettings.gradle versionCode=15
     scanignore=workdir/UnpackedTarball/owncloud_android_lib/build/outputs/aar/owncloud_android_lib-release.aar,workdir/UnpackedTarball/owncloud_android_lib/build/outputs/aar/owncloud_android_lib-debug.aar,icon-themes/tango/res/*.png,icon-themes/galaxy/res/*.png,instdir/program/classes/unoloader.jar,instdir/program/classes/ridl.jar,instdir/program/classes/unoil.jar,instdir/program/classes/jurt.jar,instdir/program/classes/juh.jar,instdir/program/classes/java_uno.jar
-    build=ln -s $(which gradle) gradlew && \
+    build=echo 'gradle "$@"' > gradlew && \
+        chmod a+x gradlew && \
         pushd ../../ && \
         rm -r workdir && \
         rm -r instdir && \