diff --git a/org.jacoco.doc/docroot/doc/build.html b/org.jacoco.doc/docroot/doc/build.html
index ef7297d4d..8cca1348e 100644
--- a/org.jacoco.doc/docroot/doc/build.html
+++ b/org.jacoco.doc/docroot/doc/build.html
@@ -98,6 +98,7 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>JDK 19</td>
     <td>JDK 20</td>
     <td>JDK 21</td>
+    <td>JDK 22</td>
   </tr>
   </thead>
   <tbody>
@@ -120,6 +121,7 @@ <h2>Compilation and testing with different JDKs</h2>
     <td></td>
     <td></td>
     <td>21</td>
+    <td>21</td>
   </tr>
   <tr>
     <td>org.jacoco.core.test.validation.java16</td>
@@ -140,6 +142,7 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>16</td>
     <td>16</td>
     <td>16</td>
+    <td>16</td>
   </tr>
   <tr>
     <td>org.jacoco.core.test.validation.java14</td>
@@ -160,6 +163,7 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>14</td>
     <td>14</td>
     <td>14</td>
+    <td>14</td>
   </tr>
   <tr>
     <td>org.jacoco.core.test.validation.java8</td>
@@ -180,6 +184,7 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>8</td>
     <td>8</td>
     <td>8</td>
+    <td>8</td>
   </tr>
   <tr>
     <td>org.jacoco.core.test.validation.java7</td>
@@ -200,6 +205,7 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>7</td>
     <td>7</td>
     <td>7</td>
+    <td>7</td>
   </tr>
   <tr>
     <td>org.jacoco.core.test.validation.groovy</td>
@@ -220,6 +226,7 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>8</td>
     <td>8</td>
     <td>8</td>
+    <td>8</td>
   </tr>
   <tr>
     <td>org.jacoco.core.test.validation.kotlin</td>
@@ -240,6 +247,7 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>6</td>
     <td>6</td>
     <td>6</td>
+    <td>6</td>
   </tr>
   <tr>
     <td>org.jacoco.core.test.validation.scala</td>
@@ -260,6 +268,7 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>8</td>
     <td>8</td>
     <td>8</td>
+    <td>8</td>
   </tr>
   <tr>
     <td>all other modules</td>
@@ -280,6 +289,7 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>7</td>
     <td>7</td>
     <td>7</td>
+    <td>7</td>
   </tr>
   </tbody>
 </table>
@@ -330,7 +340,8 @@ <h2>Compilation and testing with different JDKs</h2>
   <li><code>mvn clean verify -Djdk.version=19 -Dbytecode.version=19</code></li>
   <li><code>mvn clean verify -Djdk.version=20 -Dbytecode.version=20</code></li>
   <li><code>mvn clean verify -Djdk.version=21 -Dbytecode.version=21</code></li>
-  <li><code>mvn clean verify -Djdk.version=20 -Dbytecode.version=21 -Decj</code></li>
+  <li><code>mvn clean verify -Djdk.version=21 -Dbytecode.version=21 -Decj</code></li>
+  <li><code>mvn clean verify -Djdk.version=22 -Dbytecode.version=22</code></li>
 </ul>
 
 
diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html
index b07771756..6e366abe1 100644
--- a/org.jacoco.doc/docroot/doc/changes.html
+++ b/org.jacoco.doc/docroot/doc/changes.html
@@ -22,6 +22,8 @@ <h2>Snapshot Build @qualified.bundle.version@ (@build.date@)</h2>
 
 <h3>New Features</h3>
 <ul>
+  <li>JaCoCo now officially supports Java 22
+      (GitHub <a href="https://github.com/jacoco/jacoco/issues/1596">#1596</a>).</li>
   <li>Experimental support for Java 23 class files
       (GitHub <a href="https://github.com/jacoco/jacoco/issues/1553">#1553</a>).</li>
 </ul>
diff --git a/org.jacoco.doc/docroot/doc/environment.html b/org.jacoco.doc/docroot/doc/environment.html
index 74e644781..cc787d240 100644
--- a/org.jacoco.doc/docroot/doc/environment.html
+++ b/org.jacoco.doc/docroot/doc/environment.html
@@ -69,7 +69,7 @@ <h3>JRE/JDK</h3>
   The minimum supported JRE version for JaCoCo is Java 5. To guarantee
   compatibility JaCoCo release builds should always be executed using JDK 5.
   In addition we run builds with 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17
-  18, 19, 20 and 21 JDKs.
+  18, 19, 20, 21 and 22 JDKs.
 </p>
 
 <h3>Build</h3>
diff --git a/org.jacoco.doc/docroot/doc/faq.html b/org.jacoco.doc/docroot/doc/faq.html
index 416b41ebc..54ba89885 100644
--- a/org.jacoco.doc/docroot/doc/faq.html
+++ b/org.jacoco.doc/docroot/doc/faq.html
@@ -45,7 +45,7 @@ <h3>Does JaCoCo have a plug-in for [Eclipse|Netbeans|Whatever...]?</h3>
 
 <h3>What Java versions are supported by JaCoCo?</h3>
 <p>
-  JaCoCo supports Java class files from version 1.0 to 21. However the minimum
+  JaCoCo supports Java class files from version 1.0 to 22. However the minimum
   JRE version required by the JaCoCo runtime (e.g. the agent) and the JaCoCo
   tools is 1.5. Also note that class files under test from version 1.6 and above
   have to contain valid stackmap frames.