diff --git a/general/prog/java.xml b/general/prog/java.xml
index 2c7fd46359..faf7944d33 100644
--- a/general/prog/java.xml
+++ b/general/prog/java.xml
@@ -17,7 +17,7 @@
 <!-- Reuploaded to anduin due to the complexity of the download URL, per Bruce's
      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      "b9629a85041fbbc1579c0f02711a83bb">
+  <!ENTITY openjdk-bin-md5sum-x64      "99ec5eb2a973081120c63cce2079f7b8">
   <!ENTITY openjdk-bin-size-x64        "160 MB">
   <!ENTITY openjdk-bin-buildsize-x64   "319 MB">
 ]>
diff --git a/general/prog/openjdk.xml b/general/prog/openjdk.xml
index dbe3c954c9..792777ed49 100644
--- a/general/prog/openjdk.xml
+++ b/general/prog/openjdk.xml
@@ -10,7 +10,7 @@
 
   <!ENTITY anduin-download           "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
 
-  <!ENTITY ojdk-md5sum               "b7ce8aaafaf0f244321b54132d9ff72e">
+  <!ENTITY ojdk-md5sum               "f0e9c9a471e094786ad840d6bed5cc32">
   <!ENTITY ojdk-size                 "101 MB">
 
   <!ENTITY jtreg-version             "6.1+1">
@@ -18,8 +18,8 @@
   <!ENTITY jtreg-md5sum              "49e6bfa2506e96f461a01f9421a0961c">
   <!ENTITY jtreg-size                "8.0 MB">
 
-  <!ENTITY ojdk-bdsize               "4.6 GB (add 590 MB for tests)">
-  <!ENTITY ojdk-time                 "4.9 SBU with 4 jobs (add 47 SBU for tests with 4 jobs)">
+  <!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)">
 ]>
 
 <sect1 id="openjdk" xreflabel="OpenJDK-&openjdk-version;">
@@ -259,7 +259,7 @@ bash configure --enable-unlimited-crypto              \
                --with-libjpeg=system                  \
                --with-libpng=system                   \
                --with-zlib=system                     \
-               --with-version-build="&openjdk-build;"              \
+               --with-version-build="&openjdk-build;"               \
                --with-version-pre=""                  \
                --with-version-opt=""                  \
                --with-cacerts-file=/etc/pki/tls/java/cacerts &amp;&amp;
@@ -298,7 +298,10 @@ unset JT_JAVA</userinput></screen>
          for i686:   passed: 6,208; failed: 29; error: 6
          18.0.1+10:
          for x86_64: passed: 6,323; failed: 53; error: 14
-         for i686:   passed: 6,290; failed: 29; error: 11-->
+         for i686:   passed: 6,290; failed: 29; error: 11
+         18.0.1.1+2:
+         for x86_64: passed: 6,323; failed: 53; error: 14
+         for i686:   passed: TBA; failed: TBA; error: TBA-->
 
     <para>
       Install the package with the following commands as the
diff --git a/packages.ent b/packages.ent
index 2590384826..daf22a9215 100644
--- a/packages.ent
+++ b/packages.ent
@@ -405,8 +405,8 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY junit-version                "4.12">
 <!ENTITY hamcrest-version             "1.3">
 -->
-<!ENTITY openjdk-version              "18.0.1">
-<!ENTITY openjdk-build                "10">
+<!ENTITY openjdk-version              "18.0.1.1">
+<!ENTITY openjdk-build                "2">
 
 <!-- Perl module versions used in the Perl Modules instructions
      Please read the Changes file before updating a module.