diff --git a/org.jacoco.doc/docroot/doc/build.html b/org.jacoco.doc/docroot/doc/build.html
index eb894184b8..938a047b9c 100644
--- a/org.jacoco.doc/docroot/doc/build.html
+++ b/org.jacoco.doc/docroot/doc/build.html
@@ -91,6 +91,8 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>JDK 12</td>
     <td>JDK 13</td>
     <td>JDK 14</td>
+    <td>JDK 15</td>
+    <td>JDK 16</td>
   </tr>
   </thead>
   <tbody>
@@ -106,6 +108,8 @@ <h2>Compilation and testing with different JDKs</h2>
     <td></td>
     <td></td>
     <td>14</td>
+    <td>14</td>
+    <td>14</td>
   </tr>
   <tr>
     <td>org.jacoco.core.test.validation.java8</td>
@@ -119,6 +123,8 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>8</td>
     <td>8</td>
     <td>8</td>
+    <td>8</td>
+    <td>8</td>
   </tr>
   <tr>
     <td>org.jacoco.core.test.validation.java7</td>
@@ -132,6 +138,8 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>7</td>
     <td>7</td>
     <td>7</td>
+    <td>7</td>
+    <td>7</td>
   </tr>
   <tr>
     <td>org.jacoco.core.test.validation.groovy</td>
@@ -145,6 +153,8 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>8</td>
     <td>8</td>
     <td>8</td>
+    <td>8</td>
+    <td>8</td>
   </tr>
   <tr>
     <td>org.jacoco.core.test.validation.kotlin</td>
@@ -158,6 +168,8 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>7</td>
     <td>7</td>
     <td>7</td>
+    <td>7</td>
+    <td>7</td>
   </tr>
   <tr>
     <td>all other modules</td>
@@ -171,6 +183,8 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>7</td>
     <td>7</td>
     <td>7</td>
+    <td>7</td>
+    <td>7</td>
   </tr>
   </tbody>
 </table>
@@ -213,6 +227,8 @@ <h2>Compilation and testing with different JDKs</h2>
   <li><code>mvn clean verify -Djdk.version=12 -Dbytecode.version=12</code></li>
   <li><code>mvn clean verify -Djdk.version=13 -Dbytecode.version=13</code></li>
   <li><code>mvn clean verify -Djdk.version=14 -Dbytecode.version=14</code></li>
+  <li><code>mvn clean verify -Djdk.version=15 -Dbytecode.version=15</code></li>
+  <li><code>mvn clean verify -Djdk.version=16 -Dbytecode.version=16</code></li>
 </ul>
 
 
diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html
index d0cdea7ce1..0df6c89dfc 100644
--- a/org.jacoco.doc/docroot/doc/changes.html
+++ b/org.jacoco.doc/docroot/doc/changes.html
@@ -22,9 +22,10 @@ <h2>Snapshot Build @qualified.bundle.version@ (@build.date@)</h2>
 
 <h3>New Features</h3>
 <ul>
-  <li>JaCoCo now officially supports Java 15
+  <li>JaCoCo now officially supports Java 15 and 16
       (GitHub <a href="https://github.com/jacoco/jacoco/issues/1094">#1094</a>,
-      <a href="https://github.com/jacoco/jacoco/issues/1097">#1097</a>).</li>
+      <a href="https://github.com/jacoco/jacoco/issues/1097">#1097</a>,
+      <a href="https://github.com/jacoco/jacoco/issues/1176">#1176</a>).</li>
   <li>Experimental support for Java 17 class files
       (GitHub <a href="https://github.com/jacoco/jacoco/issues/1132">#1132</a>).</li>
   <li>Branch added by the Kotlin compiler version 1.4.0 and above for "unsafe" cast
diff --git a/org.jacoco.doc/docroot/doc/environment.html b/org.jacoco.doc/docroot/doc/environment.html
index 2e363460c3..d0788d728d 100644
--- a/org.jacoco.doc/docroot/doc/environment.html
+++ b/org.jacoco.doc/docroot/doc/environment.html
@@ -68,7 +68,7 @@ <h3>JRE/JDK</h3>
 <p>
   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 and 12 JDKs.
+  In addition we run builds with 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 and 16 JDKs.
 </p>
 
 <h3>Build</h3>
diff --git a/org.jacoco.doc/docroot/doc/faq.html b/org.jacoco.doc/docroot/doc/faq.html
index f9ec02b546..b24177d7e7 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 14. However the minimum
+  JaCoCo supports Java class files from version 1.0 to 16. 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.