diff --git a/extra/java8-openjdk/.SRCINFO b/extra/java8-openjdk/.SRCINFO
index cf2923c44..f69bd7c64 100644
--- a/extra/java8-openjdk/.SRCINFO
+++ b/extra/java8-openjdk/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = java8-openjdk
-	pkgver = 8.412.u08
+	pkgver = 8.422.u05
 	pkgrel = 1
 	url = https://openjdk.java.net/
 	arch = x86_64
@@ -19,9 +19,9 @@ pkgbase = java8-openjdk
 	makedepends = zip
 	optdepends = gvfs: open links e.g. hyperlinks
 	options = !lto
-	source = https://github.com/openjdk/jdk8u/archive/refs/tags/jdk8u412-b08.tar.gz
+	source = https://github.com/openjdk/jdk8u/archive/refs/tags/jdk8u422-b05.tar.gz
 	source = gcc11.patch
-	b2sums = caff1c2afcfd450e2cf59e0006f1f80d88707868fbb6bb1e1b9fbb74c0b2f07c879fd859228526f71f0236aebdb9daa139404582ad8038316c898590cde9f325
+	b2sums = 44982a99b2d5d381f763cce2e5deacf1b9dcc9a5ee513d76890a9ecaeb3b6bc2c1fc9adce564e56781df5b85227f88f45d3752f57c1632ebd923984f9c4c3992
 	b2sums = 9679e4dfb6027a87376081489c09810812d6849573afac4ea96abe3a3e00ca5b6af7d0ffb010c43b93cfa913f9e97fbb9f11e19fcc86a89b4548442671c32da1
 
 pkgname = jre8-openjdk-headless
@@ -39,13 +39,13 @@ pkgname = jre8-openjdk-headless
 pkgname = jre8-openjdk
 	pkgdesc = OpenJDK Java 8 full runtime environment
 	install = install_jre8-openjdk.sh
-	depends = jre8-openjdk-headless=8.412.u08-1
+	depends = jre8-openjdk-headless=8.422.u05-1
 	depends = xdg-utils
 	depends = hicolor-icon-theme
 	depends = giflib
 	optdepends = icedtea-web: web browser plugin + Java Web Start
 	optdepends = alsa-lib: for basic sound support
-	optdepends = gtk2: for the Gtk+ look and feel - desktop usage
+	optdepends = gtk3: for the Gtk+ look and feel - desktop usage
 	optdepends = java8-openjfx: for JavaFX GUI components support
 	provides = java-runtime=8
 	provides = java-runtime-openjdk=8
@@ -55,7 +55,7 @@ pkgname = jdk8-openjdk
 	pkgdesc = OpenJDK Java 8 development kit
 	install = install_jdk8-openjdk.sh
 	depends = java-environment-common
-	depends = jre8-openjdk=8.412.u08-1
+	depends = jre8-openjdk=8.422.u05-1
 	provides = java-environment=8
 	provides = java-environment-openjdk=8
 	replaces = jdk8-openjdk-wm
diff --git a/extra/java8-openjdk/PKGBUILD b/extra/java8-openjdk/PKGBUILD
index 3fafef96b..019008761 100644
--- a/extra/java8-openjdk/PKGBUILD
+++ b/extra/java8-openjdk/PKGBUILD
@@ -16,8 +16,8 @@ pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src')
 pkgbase=java8-openjdk
 
 _majorver=8
-_minorver=412
-_updatever=08
+_minorver=422
+_updatever=05
 pkgver=${_majorver}.${_minorver}.u${_updatever}
 pkgrel=1
 arch=('x86_64')
@@ -45,7 +45,7 @@ options=(!lto !distcc)
 source=(https://github.com/openjdk/jdk${_majorver}u/archive/refs/tags/jdk${_majorver}u${_minorver}-b${_updatever}.tar.gz
         gcc11.patch
         8143245-pr3548.patch)
-b2sums=('caff1c2afcfd450e2cf59e0006f1f80d88707868fbb6bb1e1b9fbb74c0b2f07c879fd859228526f71f0236aebdb9daa139404582ad8038316c898590cde9f325'
+b2sums=('44982a99b2d5d381f763cce2e5deacf1b9dcc9a5ee513d76890a9ecaeb3b6bc2c1fc9adce564e56781df5b85227f88f45d3752f57c1632ebd923984f9c4c3992'
         '9679e4dfb6027a87376081489c09810812d6849573afac4ea96abe3a3e00ca5b6af7d0ffb010c43b93cfa913f9e97fbb9f11e19fcc86a89b4548442671c32da1')
 
 case "${CARCH}" in
@@ -82,7 +82,7 @@ build() {
 
   # Avoid optimization of HotSpot being lowered from O3 to O2
   # -fno-exceptions for FS#73134
-  export CFLAGS="${CFLAGS//-O2/-O3} -Wno-error=nonnull -Wno-error=deprecated-declarations -Wno-error=stringop-overflow= -Wno-error=return-type -Wno-error=cpp -fno-lifetime-dse -fno-delete-null-pointer-checks -fcommon -fno-exceptions -Wno-error=format-overflow="
+  export CFLAGS="${CFLAGS//-O2/-O3} -Wno-error=nonnull -Wno-error=deprecated-declarations -Wno-error=stringop-overflow= -Wno-error=return-type -Wno-error=cpp -fno-lifetime-dse -fno-delete-null-pointer-checks -fcommon -fno-exceptions -Wno-error=format-overflow= -Wno-error=int-conversion -Wno-error=incompatible-pointer-types"
   export CXXFLAGS="${CXXFLAGS} -fcommon -fno-exceptions"
 
   install -d -m 755 "${srcdir}/${_prefix}/"
@@ -97,7 +97,8 @@ build() {
     --with-jvm-variants=zero \
     --with-extra-cflags="${CFLAGS}" \
     --with-extra-cxxflags="${CXXFLAGS}" \
-    --with-extra-ldflags="${LDFLAGS}"
+    --with-extra-ldflags="${LDFLAGS}" \
+    --with-vendor-name="Arch Linux"
 
   # These help to debug builds: LOG=trace HOTSPOT_BUILD_JOBS=1
   # Without 'DEBUG_BINARIES', i686 won't build: http://mail.openjdk.java.net/pipermail/core-libs-dev/2013-July/019203.html