Index: general/prog/java.xml
===================================================================
--- general/prog/java.xml	(revision 6d237beedea08fbe1468cf23986dc5bcfae0ed3f)
+++ general/prog/java.xml	(revision 7c6b211f0e32b9315d3d70df22c4ce02f85b90c9)
@@ -8,5 +8,7 @@
     the directory: this saves more than 70 MB. -->
   <!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-download-binary-x86 "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;/OpenJDK-&openjdk-version;+&openjdk-build;-i686-bin.tar.xz">-->
+  <!-- The i686 binary will come today or tomorrow. 8/12/22 or 8/13/22. -->
+  <!ENTITY openjdk-download-binary-x86 "&sources-anduin-http;/OpenJDK/OpenJDK-18.0.1.1/OpenJDK-18.0.1.1+2-i686-bin.tar.xz">
   <!ENTITY openjdk-bin-md5sum-x86      "cdcbbd909fff6db24473f6a49f1e6dcb">
   <!ENTITY openjdk-bin-size-x86        "154 MB">
@@ -18,7 +20,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      "99ec5eb2a973081120c63cce2079f7b8">
+  <!ENTITY openjdk-bin-md5sum-x64      "89271dd2c7655c4c2b256f68abc4b732">
   <!ENTITY openjdk-bin-size-x64        "160 MB">
-  <!ENTITY openjdk-bin-buildsize-x64   "319 MB">
+  <!ENTITY openjdk-bin-buildsize-x64   "320 MB">
 ]>
 
Index: general/prog/ojdk-conf.xml
===================================================================
--- general/prog/ojdk-conf.xml	(revision 6d237beedea08fbe1468cf23986dc5bcfae0ed3f)
+++ general/prog/ojdk-conf.xml	(revision 7c6b211f0e32b9315d3d70df22c4ce02f85b90c9)
@@ -39,6 +39,5 @@
 
 # Auto Java CLASSPATH: Copy jar files to, or create symlinks in, the
-# /usr/share/java directory. Note that having gcj jars with OpenJDK 8
-# may lead to errors.
+# /usr/share/java directory.
 
 AUTO_CLASSPATH_DIR=/usr/share/java
Index: general/prog/openjdk.xml
===================================================================
--- general/prog/openjdk.xml	(revision 6d237beedea08fbe1468cf23986dc5bcfae0ed3f)
+++ general/prog/openjdk.xml	(revision 7c6b211f0e32b9315d3d70df22c4ce02f85b90c9)
@@ -11,5 +11,5 @@
   <!ENTITY anduin-download           "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
 
-  <!ENTITY ojdk-md5sum               "f0e9c9a471e094786ad840d6bed5cc32">
+  <!ENTITY ojdk-md5sum               "23dbcb515ee1f329aa564d935f303ee4">
   <!ENTITY ojdk-size                 "101 MB">
 
@@ -19,6 +19,6 @@
   <!ENTITY jtreg-size                "8.0 MB">
 
-  <!ENTITY ojdk-bdsize               "4.6 GB (add 591 MB for tests)">
-  <!ENTITY ojdk-time                 "4.8 SBU with 4 jobs (add 51 SBU for tests with 4 jobs)">
+  <!ENTITY ojdk-bdsize               "4.5 GB (add 591 MB for tests)">
+  <!ENTITY ojdk-time                 "5.1 SBU with 4 jobs (add 41 SBU for tests with 4 jobs)">
 ]>
 
@@ -54,5 +54,5 @@
       In similar fashion to the LGPL, which allows non-free programs to link
       to libraries provided by free software, the
-      <ulink url="http://openjdk.java.net/legal/gplv2+ce.html">GNU
+      <ulink url="http://openjdk.org/legal/gplv2+ce.html">GNU
       General Public License, version 2, with the Classpath Exception</ulink>
       allows third party programs to use classes provided by free software
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 6d237beedea08fbe1468cf23986dc5bcfae0ed3f)
+++ introduction/welcome/changelog.xml	(revision 7c6b211f0e32b9315d3d70df22c4ce02f85b90c9)
@@ -42,4 +42,15 @@
     </listitem>
     -->
+    <listitem>
+      <para>August 12th, 2022</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to OpenJDK-18.0.2 (Security Update). x86
+          binary will come later today or tomorrow. Fixes
+          <ulink url="&blfs-ticket-root;16822">#16822</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>August 10th, 2022</para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 6d237beedea08fbe1468cf23986dc5bcfae0ed3f)
+++ packages.ent	(revision 7c6b211f0e32b9315d3d70df22c4ce02f85b90c9)
@@ -401,6 +401,6 @@
 <!ENTITY hamcrest-version             "1.3">
 -->
-<!ENTITY openjdk-version              "18.0.1.1">
-<!ENTITY openjdk-build                "2">
+<!ENTITY openjdk-version              "18.0.2">
+<!ENTITY openjdk-build                "8">
 
 <!-- Perl module versions used in the Perl Modules instructions
