diff --git a/extra/java8-openjdk/PKGBUILD b/extra/java8-openjdk/PKGBUILD
index 0dd7d669d..5e623f557 100644
--- a/extra/java8-openjdk/PKGBUILD
+++ b/extra/java8-openjdk/PKGBUILD
@@ -16,23 +16,21 @@ pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src')
 pkgbase=java8-openjdk
 
 _majorver=8
-_minorver=345
-_updatever=01
+_minorver=352
+_updatever=08
 pkgver=${_majorver}.${_minorver}.u${_updatever}
 pkgrel=1
-_git_tag=jdk${_majorver}u${_minorver}-b${_updatever}
 arch=('x86_64')
 url='https://openjdk.java.net/'
 license=('custom')
 makedepends=('java-environment=8' 'ccache' 'cpio' 'unzip' 'zip' 'git' 'bash'
              'libxrender' 'libxtst' 'fontconfig' 'libcups' 'alsa-lib')
 options=(!lto !distcc)
-source=(git+https://github.com/openjdk/jdk${_majorver}u.git#tag=${_git_tag}
+source=(https://github.com/openjdk/jdk${_majorver}u/archive/refs/tags/jdk${_majorver}u${_minorver}-b${_updatever}.tar.gz
         gcc11.patch
         8143245-pr3548.patch)
-sha256sums=('SKIP'
-            'e1e9452b2078c3e9b45aa73491f3f187e7a9abbc40b6a7fc9239d4e5e525569e'
-            'cebae4e056c738d54833c086e9379d2054ff80887c1f4e4ad14496c7ec65f665')
+b2sums=('d47681bb2dccc8b5b8a9e817d7cb65a3b16f0b365791e398ae433702972770fba9ec725bf4dc2589787b5b4dd516506939c103c0eceaf374a3d6d1fa41425571'
+        '9679e4dfb6027a87376081489c09810812d6849573afac4ea96abe3a3e00ca5b6af7d0ffb010c43b93cfa913f9e97fbb9f11e19fcc86a89b4548442671c32da1')
 
 case "${CARCH}" in
   'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;;
@@ -50,7 +48,7 @@ _nonheadless=(bin/policytool
               lib/${_JARCH}/libsplashscreen.so)
 
 prepare() {
-  cd jdk8u
+  cd jdk8u-jdk${_majorver}u${_minorver}-b${_updatever}
 
   # Fix build with C++17 (Fedora)
   patch -Np1 -i "${srcdir}"/gcc11.patch
@@ -60,7 +58,7 @@ prepare() {
 }
 
 build() {
-  cd jdk8u
+  cd jdk8u-jdk${_majorver}u${_minorver}-b${_updatever}
 
   unset JAVA_HOME
   # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1346
@@ -110,7 +108,7 @@ build() {
 }
 
 check() {
-  cd jdk8u
+  cd jdk8u-jdk${_majorver}u${_minorver}-b${_updatever}
   #make -k test
 }