diff --git a/java/build.sh b/java/build.sh
index aae12de..96810a0 100755
--- a/java/build.sh
+++ b/java/build.sh
@@ -3,27 +3,21 @@ set -eu
 
 export MAKEFLAGS="-j${NPROC:-$(nproc)}"
 
-version_jdk17=17.0.1+12
-version_jdk16=16.0.2+7
-version_jdk15=15.0.3+3
-version_jdk14=14.0.2+12
-version_jdk13=13.0.5.1+1
-version_jdk12=12.0.2+10
-version_jdk11=11.0.12+7
-version_jdk10=10.0.2+13
-version_jdk9=9+181
-
 [ ! -d build/install-gcc ] && ./build_gcc.sh
 [ ! -d build/install-ant ] && ./build_ant.sh
 [ ! -d build/install-icedtea7 ] && ./build_icedtea7.sh
 [ ! -d build/install-icedtea8 ] && ./build_icedtea8.sh
 [ ! -d build/install-make42 ] && ./build_make42.sh
-[ ! -d build/install-jdk9 ] && ./build_jdk.sh icedtea8 jdk9 "$version_jdk9"
-[ ! -d build/install-jdk10 ] && ./build_jdk.sh jdk9 jdk10 "$version_jdk10"
-[ ! -d build/install-jdk11 ] && ./build_jdk.sh jdk10 jdk11 "$version_jdk11"
-[ ! -d build/install-jdk12 ] && ./build_jdk.sh jdk11 jdk12 "$version_jdk12"
-[ ! -d build/install-jdk13 ] && ./build_jdk.sh jdk12 jdk13 "$version_jdk13"
-[ ! -d build/install-jdk14 ] && ./build_jdk.sh jdk13 jdk14 "$version_jdk14"
-[ ! -d build/install-jdk15 ] && ./build_jdk.sh jdk14 jdk15 "$version_jdk15"
-[ ! -d build/install-jdk16 ] && ./build_jdk.sh jdk15 jdk16 "$version_jdk16"
-[ ! -d build/install-jdk17 ] && ./build_jdk.sh jdk16 jdk17 "$version_jdk17"
+[ ! -d build/install-jdk9 ] && ./build_jdk.sh icedtea8 jdk9
+[ ! -d build/install-jdk10 ] && ./build_jdk.sh jdk9 jdk10
+[ ! -d build/install-jdk11 ] && ./build_jdk.sh jdk10 jdk11
+[ ! -d build/install-jdk12 ] && ./build_jdk.sh jdk11 jdk12
+[ ! -d build/install-jdk13 ] && ./build_jdk.sh jdk12 jdk13
+[ ! -d build/install-jdk14 ] && ./build_jdk.sh jdk13 jdk14
+[ ! -d build/install-jdk15 ] && ./build_jdk.sh jdk14 jdk15
+[ ! -d build/install-jdk16 ] && ./build_jdk.sh jdk15 jdk16
+[ ! -d build/install-jdk17 ] && ./build_jdk.sh jdk16 jdk17
+[ ! -d build/install-jdk18 ] && ./build_jdk.sh jdk17 jdk18
+[ ! -d build/install-jdk19 ] && ./build_jdk.sh jdk18 jdk19
+[ ! -d build/install-jdk20 ] && ./build_jdk.sh jdk19 jdk20
+[ ! -d build/install-jdk21 ] && ./build_jdk.sh jdk20 jdk21
diff --git a/java/build_gcc.sh b/java/build_gcc.sh
index d39be81..c40861a 100755
--- a/java/build_gcc.sh
+++ b/java/build_gcc.sh
@@ -24,6 +24,7 @@ CFLAGS='-w' CXXFLAGS='-w' ../configure \
     --disable-multilib \
     --disable-bootstrap \
     --disable-nls \
+    --without-isl \
     --enable-languages=java \
     --enable-java-home \
     --with-java-home="$dir_install/lib/jvm/jre"
diff --git a/java/build_icedtea7.sh b/java/build_icedtea7.sh
index 6b510fa..e6257a7 100755
--- a/java/build_icedtea7.sh
+++ b/java/build_icedtea7.sh
@@ -45,6 +45,7 @@ CONFIG_SHELL=/bin/bash ./configure \
     --disable-system-sctp
 
 # Build and install
+unset MAKEFLAGS
 make \
     DISTRIBUTION_PATCHES=icedtea-2.6.28-fix-includes.patch \
     DISTRIBUTION_BOOT_PATCHES=icedtea-2.6.28-fix-bootstrap.patch
diff --git a/java/build_icedtea8.sh b/java/build_icedtea8.sh
index 313ea40..44e7236 100755
--- a/java/build_icedtea8.sh
+++ b/java/build_icedtea8.sh
@@ -11,7 +11,7 @@ makeopts_jobs() {
     echo ${jobs:-1}
 }
 
-version_icedtea8=3.21.0
+version_icedtea8=3.29.0
 
 dir_download="$PWD/download"
 mkdir -p build; cd build
@@ -20,7 +20,7 @@ dir_install="$PWD/install-icedtea8"
 # Prepare source
 tar xf "$dir_download/icedtea-$version_icedtea8.tar.xz"
 cd "icedtea-$version_icedtea8"
-for part in corba hotspot jaxp jaxws jdk langtools nashorn openjdk; do
+for part in openjdk-git; do
     cp "$dir_download/icedtea-$version_icedtea8-$part.tar.xz" "$part.tar.xz"
 done
 
@@ -42,5 +42,6 @@ CONFIG_SHELL=/bin/bash ./configure \
     --disable-system-sctp
 
 # Build and install
+unset MAKEFLAGS
 make
 make install
diff --git a/java/build_jdk.sh b/java/build_jdk.sh
index 771100f..0f75e89 100755
--- a/java/build_jdk.sh
+++ b/java/build_jdk.sh
@@ -11,29 +11,31 @@ makeopts_jobs() {
     echo ${jobs:-1}
 }
 
+version_jdk21=21.0.1+12
+version_jdk20=20.0.2+9
+version_jdk19=19.0.2+7
+version_jdk18=18.0.2.1+1
+version_jdk17=17.0.10+6
+version_jdk16=16.0.2+7
+version_jdk15=15.0.10+5
+version_jdk14=14.0.2+12
+version_jdk13=13.0.14+5
+version_jdk12=12.0.2+10
+version_jdk11=11.0.22+6
+version_jdk10=10.0.2+13
+version_jdk9=9+181
+
 version_jdk_bootstrap="$1"
 version_jdk_major="$2"
-version_jdk="$3"
+eval version_jdk=\"\$version_$version_jdk_major\"
 
 dir_download="$PWD/download"
 dir_files="$PWD/files"
 mkdir -p build; cd build
 dir_install="$PWD/install-$version_jdk_major"
 
-case "$version_jdk_major" in
-jdk9)
-    archive="jdk-jdk-$version_jdk.tar.bz2"
-    srcdir="jdk-jdk-$version_jdk"
-    ;;
-jdk10|jdk11|jdk12|jdk13|jdk14|jdk15)
-    archive="${version_jdk_major}u-jdk-$version_jdk.tar.bz2"
-    srcdir="${version_jdk_major}u-jdk-$version_jdk"
-    ;;
-*)
-    archive="${version_jdk_major}u-jdk-$version_jdk.tar.gz"
-    srcdir="${version_jdk_major}u-jdk-$(echo $version_jdk | tr + -)"
-    ;;
-esac
+archive="${version_jdk_major}u-jdk-$version_jdk.tar.gz"
+srcdir="${version_jdk_major}u-jdk-$(echo $version_jdk | tr + -)"
 
 # Prepare source
 tar xf "$dir_download/$archive"
diff --git a/java/build_make42.sh b/java/build_make42.sh
index 476fe14..d4248f7 100755
--- a/java/build_make42.sh
+++ b/java/build_make42.sh
@@ -12,7 +12,7 @@ tar xf "$dir_download/make-$version_make42.tar.bz2"
 cd "make-$version_make42"
 
 # Configure source
-CFLAGS="-D__alloca=alloca -D__stat=stat" \
+CFLAGS='-D__alloca=alloca -D__stat=stat' \
 ./configure \
     --prefix="$dir_install"
 
diff --git a/java/download.sh b/java/download.sh
index c5ccba7..e73c574 100755
--- a/java/download.sh
+++ b/java/download.sh
@@ -1,18 +1,22 @@
 #!/bin/sh
 set -eu
 
-version_jdk17=17.0.1+12  # https://github.com/openjdk/jdk17u/tags
+version_jdk21=21.0.1+12  # https://github.com/openjdk/jdk21u/tags
+version_jdk20=20.0.2+9  # https://github.com/openjdk/jdk20u/tags
+version_jdk19=19.0.2+7  # https://github.com/openjdk/jdk19u/tags
+version_jdk18=18.0.2.1+1  # https://github.com/openjdk/jdk18u/tags
+version_jdk17=17.0.10+6  # https://github.com/openjdk/jdk17u/tags
 version_jdk16=16.0.2+7  # https://github.com/openjdk/jdk16u/tags
-version_jdk15=15.0.3+3  # https://hg.openjdk.java.net/jdk-updates/jdk15u/tags
-version_jdk14=14.0.2+12  # https://hg.openjdk.java.net/jdk-updates/jdk14u/tags
-version_jdk13=13.0.5.1+1  # https://hg.openjdk.java.net/jdk-updates/jdk13u/tags
-version_jdk12=12.0.2+10  # https://hg.openjdk.java.net/jdk-updates/jdk12u/tags
-version_jdk11=11.0.12+7  # https://hg.openjdk.java.net/jdk-updates/jdk11u/tags
-version_jdk10=10.0.2+13  # https://hg.openjdk.java.net/jdk-updates/jdk10u/tags
-version_jdk9=9+181  # https://hg.openjdk.java.net/jdk/jdk/tags
+version_jdk15=15.0.10+5  # https://github.com/openjdk/jdk15u/tags
+version_jdk14=14.0.2+12  # https://github.com/openjdk/jdk14u/tags
+version_jdk13=13.0.14+5  # https://github.com/openjdk/jdk13u/tags
+version_jdk12=12.0.2+10  # https://github.com/openjdk/jdk12u/tags
+version_jdk11=11.0.22+6  # https://github.com/openjdk/jdk11u/tags
+version_jdk10=10.0.2+13  # https://github.com/openjdk/jdk10u/tags
+version_jdk9=9+181  # https://github.com/openjdk/jdk9u/tags
 version_make42=4.2.1  # https://ftp.gnu.org/gnu/make/
-version_icedtea8=3.21.0  # https://icedtea.classpath.org/wiki/Main_Page#Getting_IcedTea
-version_icedtea7=2.6.28  # https://icedtea.classpath.org/wiki/Main_Page#Getting_IcedTea (2.6.18+ seems to fail)
+version_icedtea8=3.29.0  # https://icedtea.classpath.org/wiki/Main_Page#Getting_IcedTea
+version_icedtea7=2.6.28  # https://icedtea.classpath.org/wiki/Main_Page#Getting_IcedTea
 version_ant=1.9.16  # https://ant.apache.org/manual-1.9.x/index.html
 version_gcc=6.5.0  # Final version
 version_ecj=4.9  # Final version
@@ -20,27 +24,31 @@ version_ecj=4.9  # Final version
 mkdir -p download
 cd download
 
-wget -O "jdk17u-jdk-$version_jdk17.tar.gz" -c "https://github.com/openjdk/jdk17u/archive/refs/tags/jdk-$version_jdk17.tar.gz"
-wget -O "jdk16u-jdk-$version_jdk16.tar.gz" -c "https://github.com/openjdk/jdk16u/archive/refs/tags/jdk-$version_jdk16.tar.gz"
-wget -O "jdk15u-jdk-$version_jdk15.tar.bz2" -c "https://hg.openjdk.java.net/jdk-updates/jdk15u/archive/jdk-$version_jdk15.tar.bz2"
-wget -O "jdk14u-jdk-$version_jdk14.tar.bz2" -c "https://hg.openjdk.java.net/jdk-updates/jdk14u/archive/jdk-$version_jdk14.tar.bz2"
-wget -O "jdk13u-jdk-$version_jdk13.tar.bz2" -c "https://hg.openjdk.java.net/jdk-updates/jdk13u/archive/jdk-$version_jdk13.tar.bz2"
-wget -O "jdk12u-jdk-$version_jdk12.tar.bz2" -c "https://hg.openjdk.java.net/jdk-updates/jdk12u/archive/jdk-$version_jdk12.tar.bz2"
-wget -O "jdk11u-jdk-$version_jdk11.tar.bz2" -c "https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-$version_jdk11.tar.bz2"
-wget -O "jdk10u-jdk-$version_jdk10.tar.bz2" -c "https://hg.openjdk.java.net/jdk-updates/jdk10u/archive/jdk-$version_jdk10.tar.bz2"
-wget -O "jdk-jdk-$version_jdk9.tar.bz2" -c "https://hg.openjdk.java.net/jdk/jdk/archive/jdk-$version_jdk9.tar.bz2"
-wget -c "https://ftp.gnu.org/gnu/make/make-$version_make42.tar.bz2"
-wget -c "http://icedtea.classpath.org/download/source/icedtea-$version_icedtea8.tar.xz"
-wget -c "http://icedtea.classpath.org/download/source/icedtea-$version_icedtea7.tar.xz"
-wget -c "https://archive.apache.org/dist/ant/source/apache-ant-$version_ant-src.tar.bz2"
-wget -c "https://ftp.gnu.org/gnu/gcc/gcc-$version_gcc/gcc-$version_gcc.tar.xz"
-wget -c "ftp://sourceware.org/pub/java/ecj-$version_ecj.jar"
-wget -O javac.in -c 'https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-java/gcj-jdk/files/javac.in?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d'
+#wget -O "jdk21u-jdk-$version_jdk21.tar.gz" -c "https://github.com/openjdk/jdk21u/archive/refs/tags/jdk-$version_jdk21.tar.gz"
+#wget -O "jdk20u-jdk-$version_jdk20.tar.gz" -c "https://github.com/openjdk/jdk20u/archive/refs/tags/jdk-$version_jdk20.tar.gz"
+#wget -O "jdk19u-jdk-$version_jdk19.tar.gz" -c "https://github.com/openjdk/jdk19u/archive/refs/tags/jdk-$version_jdk19.tar.gz"
+#wget -O "jdk18u-jdk-$version_jdk18.tar.gz" -c "https://github.com/openjdk/jdk18u/archive/refs/tags/jdk-$version_jdk18.tar.gz"
+#wget -O "jdk17u-jdk-$version_jdk17.tar.gz" -c "https://github.com/openjdk/jdk17u/archive/refs/tags/jdk-$version_jdk17.tar.gz"
+#wget -O "jdk16u-jdk-$version_jdk16.tar.gz" -c "https://github.com/openjdk/jdk16u/archive/refs/tags/jdk-$version_jdk16.tar.gz"
+#wget -O "jdk15u-jdk-$version_jdk15.tar.gz" -c "https://github.com/openjdk/jdk15u/archive/refs/tags/jdk-$version_jdk15.tar.gz"
+#wget -O "jdk14u-jdk-$version_jdk14.tar.gz" -c "https://github.com/openjdk/jdk14u/archive/refs/tags/jdk-$version_jdk14.tar.gz"
+#wget -O "jdk13u-jdk-$version_jdk13.tar.gz" -c "https://github.com/openjdk/jdk13u/archive/refs/tags/jdk-$version_jdk13.tar.gz"
+#wget -O "jdk12u-jdk-$version_jdk12.tar.gz" -c "https://github.com/openjdk/jdk12u/archive/refs/tags/jdk-$version_jdk12.tar.gz"
+#wget -O "jdk11u-jdk-$version_jdk11.tar.gz" -c "https://github.com/openjdk/jdk11u/archive/refs/tags/jdk-$version_jdk11.tar.gz"
+#wget -O "jdk10u-jdk-$version_jdk10.tar.gz" -c "https://github.com/openjdk/jdk10u/archive/refs/tags/jdk-$version_jdk10.tar.gz"
+#wget -O "jdk9u-jdk-$version_jdk9.tar.gz" -c "https://github.com/openjdk/jdk9u/archive/refs/tags/jdk-$version_jdk9.tar.gz"
+#wget -c "https://ftp.gnu.org/gnu/make/make-$version_make42.tar.bz2"
+#wget -c "http://icedtea.classpath.org/download/source/icedtea-$version_icedtea8.tar.xz"
+#wget -c "http://icedtea.classpath.org/download/source/icedtea-$version_icedtea7.tar.xz"
+#wget -c "https://archive.apache.org/dist/ant/source/apache-ant-$version_ant-src.tar.bz2"
+#wget -c "https://ftp.gnu.org/gnu/gcc/gcc-$version_gcc/gcc-$version_gcc.tar.xz"
+#wget -c "ftp://sourceware.org/pub/java/ecj-$version_ecj.jar"
+#wget -O javac.in -c 'https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-java/gcj-jdk/files/javac.in?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d'
 
 for part in corba hotspot jaxp jaxws jdk langtools openjdk; do
     wget -O "icedtea-$version_icedtea7-$part.tar.bz2" -c "http://icedtea.classpath.org/download/drops/icedtea7/$version_icedtea7/$part.tar.bz2"
 done
-for part in corba hotspot jaxp jaxws jdk langtools nashorn openjdk; do
+for part in openjdk-git; do
     wget -O "icedtea-$version_icedtea8-$part.tar.xz" -c "http://icedtea.classpath.org/download/drops/icedtea8/$version_icedtea8/$part.tar.xz"
 done
 
diff --git a/java/download.sha256 b/java/download.sha256
index 24e92c0..da99ec4 100644
--- a/java/download.sha256
+++ b/java/download.sha256
@@ -9,23 +9,20 @@ fd93e65a4692593c2100963be2c75d697a32ba51ee2c02c7e7dccc524dfb1788  icedtea-2.6.28
 24799d5ebebfb1e316f9434db1db5a360ac7c86e5783ce58693536f978a0aa47  icedtea-2.6.28-langtools.tar.bz2
 78e5e89fc510280401e227d980abe30d49ea508c3eec537035481fd21a3b2c32  icedtea-2.6.28-openjdk.tar.bz2
 951188e6c0e3599de22f5cb2d95b5da9bf480763b5c8c600dae9fec88cff1735  icedtea-2.6.28.tar.xz
-ab0bff4445822c5e5741088da0e83a9bc20d059b8a95fcffd5885c03969bbeeb  icedtea-3.21.0-corba.tar.xz
-4231a4b534b1c44aaf5e0b51833f0e40f0654dcaa41c6259cf65037eccd427ae  icedtea-3.21.0-hotspot.tar.xz
-c5bb8b86a8d24ca7abde8f6cf15dec18c6e9a5201e4942a7ef117b28c960f54f  icedtea-3.21.0-jaxp.tar.xz
-6a1244d4b8c0f78d34e44edb92a96cb127ec4b43847a6d5a176c37f392499993  icedtea-3.21.0-jaxws.tar.xz
-eab27c3ad455b68b29fec2f59730d48c97f53699000da21a5e1640b825840385  icedtea-3.21.0-jdk.tar.xz
-499c749aa8dbe120bde899d0712d47e3cebc7d4a0a4b4c9b6afb2b0bdda98b82  icedtea-3.21.0-langtools.tar.xz
-495276d1e1e6b3a5a0d257c21b2e6349b000ac083be209a47a01b45894a65d59  icedtea-3.21.0-nashorn.tar.xz
-ea3fe2097a0ce02e6781e8a0cc1b923ab52803a527cc34ef686779c04a3e1c21  icedtea-3.21.0-openjdk.tar.xz
-f83ee85d39f39a304dbd6c79aaeb4fa04257fc2e61031d0a28587a1953ba2459  icedtea-3.21.0.tar.xz
+74d33382e17a757728bc209595a89068528406428fe3c66fc0bbf9d489ecfc14  icedtea-3.29.0-openjdk-git.tar.xz
+9954bf4ee8f7f4dbdec621419e6f2c42d3e97102987a7edb374e3bda7baf5169  icedtea-3.29.0.tar.xz
 3bb23cff0a6e5a7a820e19cce4b9b0f51a7b84ee9e0eeb048b463a5f3e996db0  javac.in
-374f7ae35f0a7439a40bd2c765d1f410607c75c6c1e788f1a344a42e59431f51  jdk10u-jdk-10.0.2+13.tar.bz2
-03531735116e74644b729fc0b8663ed72f7c83ebe093c02f1887be89264d8b92  jdk11u-jdk-11.0.12+7.tar.bz2
-f7242b56e0292bc7ec5795bbaeb98552ef30d7a686cd7ca0a877fe37b399f384  jdk12u-jdk-12.0.2+10.tar.bz2
-f7b2b121f4badb9da8167bda48d74b01cee39c19c4148e0eba383812c7258c8e  jdk13u-jdk-13.0.5.1+1.tar.bz2
-a2e858dcce16fe89c20e265d9735e2cf1ae68a81b79cf55deb658ffc9de44c25  jdk14u-jdk-14.0.2+12.tar.bz2
-4caca47081a23e4ec4d558f7649a9a3f0f34d300f4e6fde5767325c76214e19b  jdk15u-jdk-15.0.3+3.tar.bz2
+39ce1238d5b2066ffe1c1a09d87c170766309fe18290f27a4ab7d15844d34dc1  jdk10u-jdk-10.0.2+13.tar.gz
+8bae7c5e608de84aa32010365514bb59cd0d8ba709f6730cc473e159c6bfb918  jdk11u-jdk-11.0.22+6.tar.gz
+8494fa3a6ffef590c86b403379422f325101bc86607557cb27c6774d59710b84  jdk12u-jdk-12.0.2+10.tar.gz
+4c8e88490ed30276ea0145d37f33e094fcf436ce528bab29f6a9a3546820faf4  jdk13u-jdk-13.0.14+5.tar.gz
+582e3d805ab74582332250f95f9845608c8f3d3273aa92af6f683c45d1a4f8e8  jdk14u-jdk-14.0.2+12.tar.gz
+7aaeab4a68471e630d91eaf5540d067c8ffd5f023031be082b889763c1f94f3a  jdk15u-jdk-15.0.10+5.tar.gz
 b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c  jdk16u-jdk-16.0.2+7.tar.gz
-8c076203a6f85ab916b3e54de1992bcbcc5ffe580c52b1ac8d52ca7afb9f02d1  jdk17u-jdk-17.0.1+12.tar.gz
-8df9102cd985df96733cd7b6e58136681bd6df8812698393d6fcf5049b0dc7e3  jdk-jdk-9+181.tar.bz2
+3d5ef3a18c4edfa6e2a16c74d9e771b09eed433006b1380df450aa88725c7238  jdk17u-jdk-17.0.10+6.tar.gz
+7d026848a48e8777d3242bab2adf30122f0acda88abbd3f92636f8793eaf3455  jdk18u-jdk-18.0.2.1+1.tar.gz
+5903efd527dd08e9c235c8822e3d5699c3d18a8618c3e533307e8d6491ffbbf0  jdk19u-jdk-19.0.2+7.tar.gz
+4d6f176075d5f2ce62fd16ebd5cc4c27a3e551ce4d3d3bc0e9946454e52fc88d  jdk20u-jdk-20.0.2+9.tar.gz
+9943e3814d3c1a31f1449f09a8b67df54841944f855a1d372be892c5e6b19217  jdk21u-jdk-21.0.1+12.tar.gz
+a80c59433d394b241ebcd36968ec6ff017fab3fdf3700a459a5b59e978dab396  jdk9u-jdk-9+181.tar.gz
 d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589  make-4.2.1.tar.bz2