diff --git a/extra/java8-openjdk/PKGBUILD b/extra/java8-openjdk/PKGBUILD
index 5e623f557..3d196e688 100644
--- a/extra/java8-openjdk/PKGBUILD
+++ b/extra/java8-openjdk/PKGBUILD
@@ -19,12 +19,25 @@ _majorver=8
 _minorver=352
 _updatever=08
 pkgver=${_majorver}.${_minorver}.u${_updatever}
-pkgrel=1
+pkgrel=2
 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')
+makedepends=(
+  'alsa-lib'
+  'bash'
+  'ccache'
+  'cpio'
+  'fontconfig'
+  'giflib'
+  'git'
+  'java-environment=8'
+  'libcups'
+  'libxrender'
+  'libxtst'
+  'unzip'
+  'zip'
+)
 options=(!lto !distcc)
 source=(https://github.com/openjdk/jdk${_majorver}u/archive/refs/tags/jdk${_majorver}u${_minorver}-b${_updatever}.tar.gz
         gcc11.patch
@@ -76,15 +89,13 @@ build() {
     --with-build-number="b${_updatever}" \
     --with-milestone="fcs" \
     --enable-unlimited-crypto \
+    --with-giflib=system \
     --with-zlib=system \
     --with-jvm-variants=zero \
     --with-extra-cflags="${CFLAGS}" \
     --with-extra-cxxflags="${CXXFLAGS}" \
     --with-extra-ldflags="${LDFLAGS}"
 
-  # TODO OpenJDK does not want last version of giflib (add 'giflib' as dependency once fixed)
-  #--with-giflib=system \
-
   # 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
   make DEBUG_BINARIES=true
@@ -189,7 +200,12 @@ package_jre8-openjdk-headless() {
 
 package_jre8-openjdk() {
   pkgdesc='OpenJDK Java 8 full runtime environment'
-  depends=("jre8-openjdk-headless=${pkgver}-${pkgrel}" 'xdg-utils' 'hicolor-icon-theme')
+  depends=(
+    "jre8-openjdk-headless=${pkgver}-${pkgrel}"
+    'xdg-utils' 
+    'hicolor-icon-theme'
+    'giflib'
+  )
   optdepends=('icedtea-web: web browser plugin + Java Web Start'
               'alsa-lib: for basic sound support'
               'gtk2: for the Gtk+ look and feel - desktop usage'