Index: general/prog/java.xml
===================================================================
--- general/prog/java.xml	(revision 2d16a06c8f7c6c97268997bddf355451f01fdb18)
+++ general/prog/java.xml	(revision 32e3833aa9d6aa814c8584de6a38289af2d88efb)
@@ -9,7 +9,7 @@
   <!ENTITY anduin-download             "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
   <!ENTITY openjdk-download-binary-x86 "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;/OpenJDK-&openjdk-version;+&openjdk-build;-i686-bin.tar.xz">
-  <!ENTITY openjdk-bin-md5sum-x86      "53d3b9789a3d14a66d7f272d7ccb509a">
-  <!ENTITY openjdk-bin-size-x86        "158 MB">
-  <!ENTITY openjdk-bin-buildsize-x86   "307 MB">
+  <!ENTITY openjdk-bin-md5sum-x86      "166fa04efb3de912bd8bc0378e2747b5">
+  <!ENTITY openjdk-bin-size-x86        "161 MB">
+  <!ENTITY openjdk-bin-buildsize-x86   "313 MB">
 
 <!-- Not uploaded to anduin, since this file is now available under GNU GPLv2
@@ -18,7 +18,7 @@
      request. - Doug -->
   <!ENTITY openjdk-download-binary-x64 "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;/OpenJDK-&openjdk-version;+&openjdk-build;-x86_64-bin.tar.xz">
-  <!ENTITY openjdk-bin-md5sum-x64      "13d1157ccb01def49e8d84fa4aa77454">
-  <!ENTITY openjdk-bin-size-x64        "164 MB">
-  <!ENTITY openjdk-bin-buildsize-x64   "334 MB">
+  <!ENTITY openjdk-bin-md5sum-x64      "e3475efe35c721972dfed70cbdd2ee5c">
+  <!ENTITY openjdk-bin-size-x64        "165 MB">
+  <!ENTITY openjdk-bin-buildsize-x64   "337 MB">
 ]>
 
Index: general/prog/openjdk.xml
===================================================================
--- general/prog/openjdk.xml	(revision 2d16a06c8f7c6c97268997bddf355451f01fdb18)
+++ general/prog/openjdk.xml	(revision 32e3833aa9d6aa814c8584de6a38289af2d88efb)
@@ -6,11 +6,11 @@
 
   <!ENTITY ojdk-tarball              "jdk-&openjdk-version;-ga.tar.gz">
-  <!ENTITY ojdk-repo                 "https://github.com/openjdk/jdk20u">
+  <!ENTITY ojdk-repo                 "https://github.com/openjdk/jdk21u">
   <!ENTITY ojdk-download             "&ojdk-repo;/archive/&ojdk-tarball;">
 
   <!ENTITY anduin-download           "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
 
-  <!ENTITY ojdk-md5sum               "0a6c990bd0a4eee6eee06e89b74cde19">
-  <!ENTITY ojdk-size                 "105 MB">
+  <!ENTITY ojdk-md5sum               "064572e41dd0a0d2279ad94c3139a684">
+  <!ENTITY ojdk-size                 "107 MB">
 
   <!ENTITY jtreg-version             "7.2+1">
@@ -19,6 +19,6 @@
   <!ENTITY jtreg-size                "8.9 MB">
 
-  <!ENTITY ojdk-bdsize               "3.6 GB (add 800 MB for tests)">
-  <!ENTITY ojdk-time                 "4.8 SBU with 4 jobs (add 36 SBU for tests with 4 jobs)">
+  <!ENTITY ojdk-bdsize               "6.1 GB (add 561 MB for tests)">
+  <!ENTITY ojdk-time                 "4.2 SBU with 4 jobs (add 45 SBU for tests with 4 jobs)">
 ]>
 
@@ -261,5 +261,5 @@
                --with-libpng=system         \
                --with-zlib=system           \
-               --with-version-build="&openjdk-build;"     \
+               --with-version-build="&openjdk-build;"    \
                --with-version-pre=""        \
                --with-version-opt=""        \
@@ -314,4 +314,7 @@
          for x86_64: passed: 6,515; failed: 65; error: 14
          for i686:   passed: 6,446; failed: 33; error: 12
+         21+35:
+         for x86_64: passed: 6,699; failed: 72; error: 13
+         for i686:   passed: 6,627; failed: 30; error: 10
     -->
 
@@ -542,6 +545,6 @@
         jlink, jmap, jmod, jpackage, jps, jrunscript, jshell, jstack,
         jstat, jstatd, jwebserver, keytool, rmiregistry, and serialver</seg>
-        <seg>/opt/jdk-&openjdk-version;/lib/*</seg>
-        <seg>/opt/jdk-&openjdk-version;</seg>
+        <seg>37 libraries in /opt/jdk-&openjdk-version;+&openjdk-build;/lib/</seg>
+        <seg>/opt/jdk-&openjdk-version;+&openjdk-build;</seg>
       </seglistitem>
     </segmentedlist>
@@ -552,18 +555,4 @@
       <?dbhtml list-presentation="table"?>
 
-<!-- Not seen in 17.0.1
-      <varlistentry id="jaotc">
-        <term><command>jaotc</command></term>
-        <listitem>
-          <para>
-            is an <quote>ahead-of-time</quote> java class compiler
-          </para>
-          <indexterm zone="openjdk jaotc">
-            <primary sortas="b-jaotc">jaotc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
       <varlistentry id="jar">
         <term><command>jar</command></term>
@@ -759,19 +748,5 @@
         </listitem>
       </varlistentry>
-<!--
-      <varlistentry id="jjs">
-        <term><command>jjs</command></term>
-        <listitem>
-          <para>
-            is a command-line tool used to invoke the Nashorn engine. It
-            can be used to interpret one or several script files, or to run
-            an interactive shell.
-          </para>
-          <indexterm zone="openjdk jjs">
-            <primary sortas="b-jjs">jjs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
+
       <varlistentry id="jlink">
         <term><command>jlink</command></term>
@@ -923,45 +898,4 @@
         </listitem>
       </varlistentry>
-      <!--
-      <varlistentry id="pack200">
-        <term><command>pack200</command></term>
-        <listitem>
-          <para>
-            is a Java application that transforms a jar file into a
-            compressed pack200 file using the Java gzip compressor.
-          </para>
-          <indexterm zone="openjdk pack200">
-            <primary sortas="b-pack200">pack200</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmic">
-        <term><command>rmic</command></term>
-        <listitem>
-          <para>
-            generates stub and skeleton class files for remote objects
-            from the names of compiled Java classes that contain remote
-            object implementations.
-          </para>
-          <indexterm zone="openjdk rmic">
-            <primary sortas="b-rmic">rmic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-<!-- Not seen in 17.0.1
-      <varlistentry id="rmid">
-        <term><command>rmid</command></term>
-        <listitem>
-          <para>
-            starts the activation system daemon
-          </para>
-          <indexterm zone="openjdk rmid">
-            <primary sortas="b-rmid">rmid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
 
       <varlistentry id="rmiregistry">
@@ -990,19 +924,4 @@
         </listitem>
       </varlistentry>
-      <!--
-      <varlistentry id="unpack200">
-        <term><command>unpack200</command></term>
-        <listitem>
-          <para>
-            is a native implementation that transforms a packed file
-            produced by <application>pack200</application> into a jar
-            file.
-          </para>
-          <indexterm zone="openjdk unpack200">
-            <primary sortas="b-unpack200">unpack200</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
     </variablelist>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 2d16a06c8f7c6c97268997bddf355451f01fdb18)
+++ introduction/welcome/changelog.xml	(revision 32e3833aa9d6aa814c8584de6a38289af2d88efb)
@@ -41,4 +41,14 @@
 
     <listitem>
+      <para>September 28th, 2023</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to OpenJDK-21. Fixes
+          <ulink url="&blfs-ticket-root;18611">#18611</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>September 27th, 2023</para>
       <itemizedlist>
Index: packages.ent
===================================================================
--- packages.ent	(revision 2d16a06c8f7c6c97268997bddf355451f01fdb18)
+++ packages.ent	(revision 32e3833aa9d6aa814c8584de6a38289af2d88efb)
@@ -364,6 +364,6 @@
 <!ENTITY yasm-version                 "1.3.0">
 
-<!ENTITY openjdk-version              "20.0.2">
-<!ENTITY openjdk-build                "9">
+<!ENTITY openjdk-version              "21">
+<!ENTITY openjdk-build                "35">
 <!ENTITY apache-ant-version           "1.10.14">
 
