diff --git a/repos/extra-x86_64/PKGBUILD b/repos/extra-x86_64/PKGBUILD
index a13bfbd..8aef592 100644
--- a/repos/extra-x86_64/PKGBUILD
+++ b/repos/extra-x86_64/PKGBUILD
@@ -57,11 +57,13 @@ source=(
   gradle.properties
   java-openjfx-flags.patch
   java-openjfx-no-xlocale.patch
+  java-openjfx-gradle.patch
 )
 sha256sums=('9958e615818c526250c36059ae6ba0c7523e192193c8b5d5ca672ebcd498f1ca'
             '2622aa35d733cc69f4421f1cd053bf425e89f93141cb52c9f016a9b425fc0cb6'
             'e76f202e8163a9a6e02138987bfc344a66f70aa30b8b699c6bdb41eec31c1465'
-            '220c63396561867a6d07ae81b6390160d8f91502587e4873998e3b7a83793a1c')
+            '220c63396561867a6d07ae81b6390160d8f91502587e4873998e3b7a83793a1c'
+            '25a60aa8dfee62c3e8a64eef5f57e09dd4b2caa8f920ce916c0e5399ce67d9bc')
 
 prepare() {
   cd rt-${pkgver//.u/+}
@@ -69,6 +71,7 @@ prepare() {
   ln -sf ../gradle.properties .
   patch -Np1 -i ../java-openjfx-flags.patch
   patch -Np1 -i ../java-openjfx-no-xlocale.patch
+  patch -Np1 -i ../java-openjfx-gradle.patch
   sed 's|, "-Werror"||g' -i buildSrc/linux.gradle
 }
 
diff --git a/repos/extra-x86_64/java-openjfx-gradle.patch b/repos/extra-x86_64/java-openjfx-gradle.patch
new file mode 100644
index 0000000..9409da5
--- /dev/null
+++ b/repos/extra-x86_64/java-openjfx-gradle.patch
@@ -0,0 +1,62 @@
+From 64aaeb840aa157e358eb41001c3705aa5c2fee30 Mon Sep 17 00:00:00 2001
+From: Kevin Rushforth <kcr@openjdk.org>
+Date: Mon, 14 Oct 2019 15:37:12 +0000
+Subject: [PATCH] 8226754: FX build fails using gradle 5.6+ or 6
+
+Remove obsolete STABLE_PUBLISHING; explicitly set output.resourcesDir; bump minimum gradle version to 5.3
+
+Reviewed-by: jvos
+---
+ build.gradle     | 2 ++
+ build.properties | 2 +-
+ settings.gradle  | 4 ----
+ 3 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/build.gradle b/build.gradle
+index 22063aa24d..a3d5f2502a 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -3810,6 +3810,7 @@ allprojects {
+         project.jar.enabled = false
+ 
+         // and redirect the resources into the module
++        project.sourceSets.main.output.resourcesDir = project.moduleDir
+         project.processResources.destinationDir = project.moduleDir
+     }
+ 
+@@ -3843,6 +3844,7 @@ allprojects {
+         project.sourceSets.shims.resources.srcDirs += project.sourceSets.main.resources.srcDirs
+ 
+         // and redirect the resources into the module
++        project.sourceSets.shims.output.resourcesDir = project.moduleShimsDir
+         project.processShimsResources.destinationDir = project.moduleShimsDir
+ 
+        compileTestJava.dependsOn(copyGeneratedShimsTask)
+diff --git a/build.properties b/build.properties
+index 8e7752fca3..d86dd45929 100644
+--- a/build.properties
++++ b/build.properties
+@@ -85,7 +85,7 @@ jfx.build.jdk.buildnum.min=28
+ # The jfx.gradle.version.min property defines the minimum version of gradle
+ # that is supported. It must be <= jfx.gradle.version.
+ jfx.gradle.version=5.3
+-jfx.gradle.version.min=4.8
++jfx.gradle.version.min=5.3
+ 
+ # Toolchains
+ jfx.build.linux.gcc.version=gcc8.2.0-OL6.4+1.0
+diff --git a/settings.gradle b/settings.gradle
+index 03576dec68..e372c0e48e 100644
+--- a/settings.gradle
++++ b/settings.gradle
+@@ -35,10 +35,6 @@ project(":web").projectDir = file("modules/javafx.web")
+ project(":media").projectDir = file("modules/javafx.media")
+ project(":systemTests").projectDir = file("tests/system")
+ 
+-// Stable publishing behavior is the default in gradle 5.x.
+-// This setting enables it in gradle 4.8 to help with the transition.
+-enableFeaturePreview('STABLE_PUBLISHING')
+-
+ def closedDir = file("../rt-closed")
+ def buildClosed = closedDir.isDirectory()
+