diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index cd29f3e..7439f0e 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')
+            '7e9b3134ce60ed0c32990f9f72e2c19587b6815aa03acc856d4c7dc71405ec78'
+            'b21f6b254acc7aa2124521b6521d3bdfdfcfd9b062624a84ef73608120957d0d'
+            'cd1a2bd60f636662e4f3334217b3e14f1d51cf30b77b9ca3eff8d030312fd26a'
+            '4db6e995d46f5ab29c4169dab5dbbe367ebd01dee66ef1750abe5cf0c8364d42'
+            '3487eb180fff9866c8b8b08be45f13fa9e8edd04e5719bc867e59b09b81954b4')
 
 prepare() {
   cd rt-${pkgver//./}-ga
@@ -60,10 +66,16 @@ 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() {
   cd rt-${pkgver//./}-ga
+  shopt -s extglob
+  CFLAGS=`echo "${CFLAGS//+([[:blank:]])/ }"`
 
   CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
 
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..a8338da 100644
--- a/trunk/java8-openjfx-flags.patch
+++ b/trunk/java8-openjfx-flags.patch
@@ -1,13 +1,14 @@
-diff -rupN rt-8u202-ga.orig/buildSrc/linux.gradle rt-8u202-ga/buildSrc/linux.gradle
---- rt-8u202-ga.orig/buildSrc/linux.gradle	2019-06-03 15:45:22.599465670 +0200
-+++ rt-8u202-ga/buildSrc/linux.gradle	2019-06-03 15:50:59.746039363 +0200
-@@ -44,8 +44,11 @@ LINUX.library = { name -> return "lib${n
+diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle
+index c47b7b4c..e4153f8b 100644
+--- a/buildSrc/linux.gradle
++++ b/buildSrc/linux.gradle
+@@ -44,8 +44,11 @@ LINUX.library = { name -> return "lib${name}.so" as String }
  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(" "))
 +
  if (!IS_64) {
@@ -21,7 +22,7 @@ diff -rupN rt-8u202-ga.orig/buildSrc/linux.gradle rt-8u202-ga/buildSrc/linux.gra
 +linkFlags.addAll(System.getenv("LDFLAGS").trim().split(" "))
 +
  def defaultLinkFlags = linkFlags.flatten()
-
+ 
  def gtk2CCFlags = [  ];
 @@ -274,7 +280,7 @@ LINUX.iio.nativeSource = [
  LINUX.iio.compiler = compiler
@@ -30,15 +31,23 @@ diff -rupN rt-8u202-ga.orig/buildSrc/linux.gradle rt-8u202-ga/buildSrc/linux.gra
 -LINUX.iio.linkFlags = [linkFlags].flatten()
 +LINUX.iio.linkFlags = [linkFlags, "-ljpeg"].flatten()
  LINUX.iio.lib = "javafx_iio"
-
+ 
  LINUX.prismES2 = [:]
-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
+@@ -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", "-fno-lto"].flatten()
+ LINUX.webkit.linkFlags = defaultLinkFlags.flatten()
+diff --git a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
+index df9f7f21..7922a206 100644
+--- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
++++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
 @@ -22,7 +22,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
  OBJBASE_DIR = $(BUILD_DIR)/obj/plugins/avplugin
  endif
-
+ 
 -CFLAGS = -fPIC                   \
 +CFLAGS := -fPIC                   \
           -Wformat                \
@@ -57,13 +66,13 @@ diff -rupN rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/lin
 -endif
 +         -ffunction-sections -fdata-sections \
 +         ${CFLAGS}
-
+ 
  INCLUDES= -I../../../plugins                          \
            -I../../../plugins/av                       \
-@@ -51,11 +46,12 @@ INCLUDES= -I../../../plugins
+@@ -51,11 +46,12 @@ INCLUDES= -I../../../plugins                          \
            -I$(GLIB_DIR)/glib                          \
            -I$(GLIB_DIR)/gmodule
-
+ 
 -LDFLAGS = -L$(BUILD_DIR)    \
 +LDFLAGS := -L$(BUILD_DIR)    \
            -z relro          \
@@ -72,16 +81,17 @@ diff -rupN rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/lin
 -          -static-libgcc -static-libstdc++ -Wl,--gc-sections
 +          -static-libgcc -static-libstdc++ -Wl,--gc-sections \
 +          ${LDFLAGS}
-
+ 
  ifneq ($(strip $(LIBAV_DIR)),)
  INCLUDES += -I$(LIBAV_DIR)/include
-diff -rupN rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
---- rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile	2019-06-03 15:45:28.772858454 +0200
-+++ rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile	2019-06-03 15:53:26.784252777 +0200
+diff --git a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
+index fd3847d0..de7ef8b1 100644
+--- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
++++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
 @@ -19,7 +19,7 @@ DIRLIST = progressbuffer       \
-
+ 
  TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
-
+ 
 -CFLAGS = -fPIC                   \
 +CFLAGS := -fPIC                   \
           -Wformat                \
@@ -101,29 +111,58 @@ diff -rupN rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/lin
 -
 +         -ffunction-sections -fdata-sections \
 +         ${CFLAGS}
-
+ 
  INCLUDES = -I$(SRCBASE_DIR) \
  	   $(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \
 @@ -53,9 +47,10 @@ INCLUDES = -I$(SRCBASE_DIR) \
             -I$(GLIB_DIR)/glib                        \
             -I$(GLIB_DIR)/gmodule
-
+ 
 -LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
 +LDFLAGS := -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
            -z relro \
 -          -static-libgcc -static-libstdc++ -Wl,--gc-sections
 +          -static-libgcc -static-libstdc++ -Wl,--gc-sections \
 +          ${LDFLAGS}
-
+ 
+ ifeq ($(ARCH), x32)
+     CFLAGS += -m32
+diff --git a/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile
+index c5b4b0a6..8eaceacf 100644
+--- a/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile
++++ b/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile
+@@ -40,20 +40,15 @@ CFLAGS += -fPIC \
+          -DMATCH_LIMIT=10000000 \
+          -DMATCH_LIMIT_RECURSION=10000000
+ 
+-ifeq ($(BUILD_TYPE), Release)
+-    CFLAGS += -Os
+-else
+-    CFLAGS += -g -Wall
+-endif
+-
+ INCLUDES = -I$(SRCBASE_DIR) \
+ 	   -I$(SRCBASE_DIR)/glib \
+ 	   -I$(SRCBASE_DIR)/build/linux \
+ 	   -I$(LIBFFI_DIR)/include
+ 
+-LDFLAGS = -L$(BUILD_DIR) -lffi \
++LDFLAGS := -L$(BUILD_DIR) -lffi \
+           -z relro \
+-          -static-libgcc -static-libstdc++ -Wl,--gc-sections
++          -static-libgcc -static-libstdc++ -Wl,--gc-sections \
++          ${LDFLAGS}
+ 
  ifeq ($(ARCH), x32)
      CFLAGS += -m32
-diff -rupN rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
---- rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile	2019-06-03 15:45:28.772858454 +0200
-+++ rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile	2019-06-03 15:55:03.568631974 +0200
+diff --git a/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
+index 8634b559..66bd0067 100644
+--- a/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
++++ b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
 @@ -41,7 +41,7 @@ DIRLIST = gstreamer/gst \
-
+ 
  TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
-
+ 
 -CFLAGS =-fPIC                   \
 +CFLAGS :=-fPIC                   \
          -Wformat                \
@@ -142,29 +181,30 @@ diff -rupN rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/lin
 -endif
 +        -ffunction-sections -fdata-sections \
 +        ${CFLAGS}
-
+ 
  INCLUDES = -I$(BASE_DIR)/plugins                          \
  	   -I$(SRCBASE_DIR)/projects/build/linux/common   \
-@@ -83,9 +78,10 @@ INCLUDES = -I$(BASE_DIR)/plugins
+@@ -83,9 +78,10 @@ INCLUDES = -I$(BASE_DIR)/plugins                          \
  PACKAGES_INCLUDES := $(shell pkg-config --cflags alsa)
  PACKAGES_LIBS := $(shell pkg-config --libs alsa)
-
+ 
 -LDFLAGS = -L$(BUILD_DIR) -lm -lglib-lite $(PACKAGES_LIBS) \
 +LDFLAGS := -L$(BUILD_DIR) -lm -lglib-lite $(PACKAGES_LIBS) \
            -z relro \
 -          -static-libgcc -static-libstdc++ -Wl,--gc-sections
 +          -static-libgcc -static-libstdc++ -Wl,--gc-sections \
 +          ${LDFLAGS}
-
+ 
  ifeq ($(ARCH), x32)
      CFLAGS += -m32
-diff -rupN rt-8u202-ga.orig/modules/media/src/main/native/jfxmedia/projects/linux/Makefile rt-8u202-ga/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
---- rt-8u202-ga.orig/modules/media/src/main/native/jfxmedia/projects/linux/Makefile	2019-06-03 15:45:28.819525570 +0200
-+++ rt-8u202-ga/modules/media/src/main/native/jfxmedia/projects/linux/Makefile	2019-06-03 15:57:02.209910725 +0200
+diff --git a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
+index 59747d93..b70d1a69 100644
+--- a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
++++ b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
 @@ -17,7 +17,7 @@ DIRLIST = jni                \
-
+ 
  TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
-
+ 
 -CFLAGS = -DTARGET_OS_LINUX=1     \
 +CFLAGS := -DTARGET_OS_LINUX=1     \
           -D_GNU_SOURCE           \
@@ -177,13 +217,13 @@ diff -rupN rt-8u202-ga.orig/modules/media/src/main/native/jfxmedia/projects/linu
 -         -ffunction-sections -fdata-sections
 +         -ffunction-sections -fdata-sections \
 +         ${CFLAGS}
-
+ 
  CPPFLAGS = -fno-rtti -ffunction-sections -fdata-sections
-
+ 
 @@ -57,21 +58,16 @@ ifdef HOST_COMPILE
  	           -I$(GLIB_LITE_DIR)/glib \
  	           -I$(GLIB_LITE_DIR)/gmodule
-
+ 
 -	LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
 +LDFLAGS := -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
              -z relro \
@@ -195,7 +235,7 @@ diff -rupN rt-8u202-ga.orig/modules/media/src/main/native/jfxmedia/projects/linu
  	INCLUDES = $(BASE_INCLUDES)
  	LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) $(EXTRA_LDFLAGS)
  endif
-
+ 
 -ifeq ($(BUILD_TYPE), Release)
 -	CFLAGS += -Os
 -else
@@ -205,30 +245,3 @@ diff -rupN rt-8u202-ga.orig/modules/media/src/main/native/jfxmedia/projects/linu
  ifeq ($(ARCH), x32)
      CFLAGS += -m32
      LDFLAGS += -m32
---- rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile	2019-06-04 07:44:53.882738260 +0000
-+++ rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile	2019-06-04 07:47:36.024744987 +0000
-@@ -40,20 +40,15 @@ CFLAGS += -fPIC \
-          -DMATCH_LIMIT=10000000 \
-          -DMATCH_LIMIT_RECURSION=10000000
- 
--ifeq ($(BUILD_TYPE), Release)
--    CFLAGS += -Os
--else
--    CFLAGS += -g -Wall
--endif
--
- INCLUDES = -I$(SRCBASE_DIR) \
- 	   -I$(SRCBASE_DIR)/glib \
- 	   -I$(SRCBASE_DIR)/build/linux \
- 	   -I$(LIBFFI_DIR)/include
- 
--LDFLAGS = -L$(BUILD_DIR) -lffi \
-+LDFLAGS := -L$(BUILD_DIR) -lffi \
-           -z relro \
--          -static-libgcc -static-libstdc++ -Wl,--gc-sections
-+          -static-libgcc -static-libstdc++ -Wl,--gc-sections \
-+          ${LDFLAGS}
- 
- ifeq ($(ARCH), x32)
-     CFLAGS += -m32
-