diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index aa5c6b3..dad74b6 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -22,11 +22,13 @@ makedepends=('java-environment>=11' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'lib
 source=(https://hg.openjdk.java.net/jdk-updates/jdk${_majorver}u/archive/${_hg_tag}.tar.gz
         freedesktop-java.desktop
         freedesktop-jconsole.desktop
-        freedesktop-jshell.desktop)
+        freedesktop-jshell.desktop
+        https://github.com/openjdk/panama-foreign/commit/af5c725b8109ce83fc04ef0f8bf6aaf0b50c0441.patch)
 sha256sums=('d38fb17795782dffe84e98f21f1d6293b0a45ea8f1e9c81e99cd71acac03a4e0'
             '4edd8475037062cdff87993c1745ddb6df31f49e76c2774bca3841da70675580'
             'd759e5e360abe9fae7b5f87498f81dd786aa568aa997d0cb8ba3e75fa0c364dd'
-            '939b2d8b24f18ad82c4868880e337c6291daee9b7edcfeadb8951bf99d6c2acc')
+            '939b2d8b24f18ad82c4868880e337c6291daee9b7edcfeadb8951bf99d6c2acc'
+            '1d40400aa10addadea168100e2a2879e74611b0e31b90aaf5958b14c369f057c')
 
 case "${CARCH}" in
   x86_64) _JARCH='x86_64';;
@@ -42,6 +44,11 @@ _nonheadless=(lib/libawt_xawt.{so,debuginfo}
               lib/libjsound.{so,debuginfo}
               lib/libsplashscreen.{so,debuginfo})
 
+prepare() {
+  cd ${_jdkdir}
+  patch -p1 -i ../af5c725b8109ce83fc04ef0f8bf6aaf0b50c0441.patch https://bugs.openjdk.java.net/browse/JDK-8237879
+}
+
 build() {
   cd ${_jdkdir}