diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index cd29f3e..6b540b2 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -42,17 +42,23 @@ makedepends=(
   webkit2gtk
 )
 source=(
-  https://hg.openjdk.java.net/openjfx/8u/rt/archive/${pkgver//./}-ga.tar.bz2
+  https://hg.openjdk.java.net/openjfx/8u-dev/rt/archive/${pkgver//./}-ga.tar.bz2
   gradle.properties
   https://services.gradle.org/distributions/gradle-4.8-bin.zip
   java8-openjfx-flags.patch
   java8-openjfx-no-xlocale.patch
+  java8-openjfx-no-sys-sysctl.patch
+  java8-openjfx-CVE-2021-3517-fix.patch::https://gitlab.gnome.org/GNOME/libxml2/-/commit/bf22713507fe1fc3a2c4b525cf0a88c2dc87a3a2.patch
+  java8-openjfx-CVE-2021-3522-fix.patch::https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/8a88e5c1db05ebadfd4569955f6f47c23cdca3c4.patch
 )
 sha256sums=('12b0538d04c4bd451e4692ee06357ac36233ff4ec2af9fa3b9bbdbab48c3f2fc'
-            '75335ac8ccae143ab4dbb81fc32c70d34d95baa360388f55bf2d237e8821ad97'
+            'd1c2255893e5ec6268d7c92bb6539cde629d325872f26cffb5f1f616c9d5f30d'
             'f3e29692a8faa94eb0b02ebf36fa263a642b3ae8694ef806c45c345b8683f1ba'
-            '867badaca506f130f918bdc620ae7ae5be8b176fcdfc91fef551b636d6390b19'
-            'b21f6b254acc7aa2124521b6521d3bdfdfcfd9b062624a84ef73608120957d0d')
+            'da29886c3b571ff0822beeba2bfe8a67603ba8378c635c78073f684f08c9ce75'
+            'b21f6b254acc7aa2124521b6521d3bdfdfcfd9b062624a84ef73608120957d0d'
+            'cd1a2bd60f636662e4f3334217b3e14f1d51cf30b77b9ca3eff8d030312fd26a'
+            '4db6e995d46f5ab29c4169dab5dbbe367ebd01dee66ef1750abe5cf0c8364d42'
+            '3487eb180fff9866c8b8b08be45f13fa9e8edd04e5719bc867e59b09b81954b4')
 
 prepare() {
   cd rt-${pkgver//./}-ga
@@ -60,6 +66,10 @@ prepare() {
   ln -sf ../gradle.properties .
   patch -Np1 -i ../java8-openjfx-flags.patch
   patch -Np1 -i ../java8-openjfx-no-xlocale.patch
+  patch -Np1 -i ../java8-openjfx-no-sys-sysctl.patch
+  # loose match the following patch due to whitespace differences
+  patch -Np1 -l -i "$srcdir"/java8-openjfx-CVE-2021-3517-fix.patch -d modules/web/src/main/native/Source/ThirdParty/libxml/src
+  patch -Np1 -i "$srcdir"/java8-openjfx-CVE-2021-3522-fix.patch -d modules/media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base
 }
 
 build() {
@@ -87,7 +97,6 @@ package_java8-openjfx() {
     libx11
     libxtst
     pango
-    python2
     qt5-base
     ruby
     unzip
diff --git a/trunk/gradle.properties b/trunk/gradle.properties
index 1d9cb9b..3a5a0b3 100644
--- a/trunk/gradle.properties
+++ b/trunk/gradle.properties
@@ -2,4 +2,5 @@ BUILD_JAVADOC = true
 BUILD_SRC_ZIP = true
 COMPILE_MEDIA = true
 COMPILE_WEBKIT = true
+COMPILE_JFR = false
 CONF = Release
diff --git a/trunk/java8-openjfx-flags.patch b/trunk/java8-openjfx-flags.patch
index 323ba43..1f07838 100644
--- a/trunk/java8-openjfx-flags.patch
+++ b/trunk/java8-openjfx-flags.patch
@@ -5,7 +5,7 @@ diff -rupN rt-8u202-ga.orig/buildSrc/linux.gradle rt-8u202-ga/buildSrc/linux.gra
  def commonFlags = [
          "-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags
          "-fstack-protector",
-+        "-Wno-error=cast-function-type",
++        "-Wno-error=cast-function-type","-Wno-error=deprecated-declarations",
          "-W", "-Wall", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags
 
 +commonFlags.addAll(System.getenv("CFLAGS").trim().split(" "))
@@ -32,6 +32,13 @@ diff -rupN rt-8u202-ga.orig/buildSrc/linux.gradle rt-8u202-ga/buildSrc/linux.gra
  LINUX.iio.lib = "javafx_iio"
 
  LINUX.prismES2 = [:]
+@@ -339,5 +345,5 @@ LINUX.media.lib = "ar"
+ LINUX.webkit = [:]
+ LINUX.webkit.compiler = compiler
+ LINUX.webkit.linker = linker
+-LINUX.webkit.ccFlags = commonFlags.flatten()
++LINUX.webkit.ccFlags = [commonFlags , "-std=gnu++14" ].flatten()
+ LINUX.webkit.linkFlags = defaultLinkFlags.flatten()
 diff -rupN rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
 --- rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile	2019-06-03 15:45:28.772858454 +0200
 +++ rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile	2019-06-03 15:52:15.503480874 +0200
diff --git a/trunk/java8-openjfx-no-sys-sysctl.patch b/trunk/java8-openjfx-no-sys-sysctl.patch
new file mode 100644
index 0000000..90c2d0e
--- /dev/null
+++ b/trunk/java8-openjfx-no-sys-sysctl.patch
@@ -0,0 +1,12 @@
+diff --git a/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp b/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp
+index 40f83f25..df39a3c7 100644
+--- a/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp
++++ b/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp
+@@ -43,7 +43,6 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
+-#include <sys/sysctl.h>
+ #include <iostream>
+ #include <dlfcn.h>
+ #include <signal.h>