diff --git a/community/gdal/APKBUILD b/community/gdal/APKBUILD
index b06fd08d189ab8dacdd6ad12a007f249fc16acde..9078abdf7ed1f99407d6d75c9bbd9846d636e50a 100755
--- a/community/gdal/APKBUILD
+++ b/community/gdal/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Holger Jaekel <holger.jaekel@gmx.de>
 pkgname=gdal
 pkgver=3.6.3
-pkgrel=3
+pkgrel=4
 pkgdesc="A translator library for raster and vector geospatial data formats"
 url="https://gdal.org/"
 arch="all"
@@ -29,7 +29,6 @@ makedepends="
 	libgeotiff-dev
 	libheif-dev
 	libjpeg-turbo-dev
-	libjxl-dev
 	libkml-dev
 	libpng-dev
 	libpq-dev
@@ -105,6 +104,15 @@ case "$CARCH" in
 		_with_lerc="ON";;
 esac
 
+# Optional dependency libjxl-dev is not available on s390x
+_with_libjxl="OFF"
+case "$CARCH" in
+	s390x) ;;
+	*)
+		makedepends="$makedepends libjxl-dev"
+		_with_libjxl="ON";;
+esac
+
 # Optional dependency librasterlite2-dev is only available on x86 and x86_64
 _with_librasterlite2="OFF"
 case "$CARCH" in
@@ -220,7 +228,7 @@ build() {
 		-DGDAL_USE_IDB=OFF \
 		-DGDAL_USE_JPEG=ON \
 		-DGDAL_USE_JSONC=ON \
-		-DGDAL_USE_JXL=ON \
+		-DGDAL_USE_JXL=$_with_jxl \
 		-DGDAL_USE_KDU=OFF \
 		-DGDAL_USE_KEA=ON \
 		-DGDAL_USE_LERC=$_with_lerc \