diff --git a/platforms/jvm/jacoco/src/main/java/org/gradle/testing/jacoco/plugins/JacocoPlugin.java b/platforms/jvm/jacoco/src/main/java/org/gradle/testing/jacoco/plugins/JacocoPlugin.java
index 9e50b85bd8353..7b86f5831ac9d 100644
--- a/platforms/jvm/jacoco/src/main/java/org/gradle/testing/jacoco/plugins/JacocoPlugin.java
+++ b/platforms/jvm/jacoco/src/main/java/org/gradle/testing/jacoco/plugins/JacocoPlugin.java
@@ -70,7 +70,7 @@ public abstract class JacocoPlugin implements Plugin<Project> {
      *
      * @since 3.4
      */
-    public static final String DEFAULT_JACOCO_VERSION = "0.8.9";
+    public static final String DEFAULT_JACOCO_VERSION = "0.8.11";
     public static final String AGENT_CONFIGURATION_NAME = "jacocoAgent";
     public static final String ANT_CONFIGURATION_NAME = "jacocoAnt";
     public static final String PLUGIN_EXTENSION_NAME = "jacoco";
diff --git a/platforms/jvm/jacoco/src/test/groovy/org/gradle/internal/jacoco/JacocoAgentJarTest.groovy b/platforms/jvm/jacoco/src/test/groovy/org/gradle/internal/jacoco/JacocoAgentJarTest.groovy
index e3c07085e3b2b..c7fcc1b5864fe 100644
--- a/platforms/jvm/jacoco/src/test/groovy/org/gradle/internal/jacoco/JacocoAgentJarTest.groovy
+++ b/platforms/jvm/jacoco/src/test/groovy/org/gradle/internal/jacoco/JacocoAgentJarTest.groovy
@@ -46,6 +46,8 @@ class JacocoAgentJarTest extends Specification {
         '0.8.7'               | true
         '0.8.8'               | true
         '0.8.9'               | true
+        '0.8.10'              | true
+        '0.8.11'              | true
     }
 
     def "versions >= 0.7.6 support include no location classes #version -> #incNoLocationClassesSupport"() {
@@ -69,5 +71,7 @@ class JacocoAgentJarTest extends Specification {
         '0.8.7'               | true
         '0.8.8'               | true
         '0.8.9'               | true
+        '0.8.10'              | true
+        '0.8.11'              | true
     }
 }
diff --git a/platforms/jvm/jacoco/src/testFixtures/groovy/org/gradle/testing/jacoco/plugins/fixtures/JacocoCoverage.groovy b/platforms/jvm/jacoco/src/testFixtures/groovy/org/gradle/testing/jacoco/plugins/fixtures/JacocoCoverage.groovy
index 46448175b1387..773cb9f8d91e3 100644
--- a/platforms/jvm/jacoco/src/testFixtures/groovy/org/gradle/testing/jacoco/plugins/fixtures/JacocoCoverage.groovy
+++ b/platforms/jvm/jacoco/src/testFixtures/groovy/org/gradle/testing/jacoco/plugins/fixtures/JacocoCoverage.groovy
@@ -27,6 +27,7 @@ final class JacocoCoverage {
     // Order matters here, as we want to test the latest version first
     // Relies on Groovy keeping the order of the keys in a map literal
     private static final Map<JavaVersion, JacocoVersion> JDK_CUTOFFS = [
+        (JavaVersion.VERSION_21): JacocoVersion.SUPPORTS_JDK_21,
         (JavaVersion.VERSION_20): JacocoVersion.SUPPORTS_JDK_20,
         (JavaVersion.VERSION_18): JacocoVersion.SUPPORTS_JDK_18,
         (JavaVersion.VERSION_17): JacocoVersion.SUPPORTS_JDK_17,
@@ -59,6 +60,7 @@ final class JacocoCoverage {
         static final SUPPORTS_JDK_17 = new JacocoVersion(0, 8, 7)
         static final SUPPORTS_JDK_18 = new JacocoVersion(0, 8, 8)
         static final SUPPORTS_JDK_20 = new JacocoVersion(0, 8, 9)
+        static final SUPPORTS_JDK_21 = new JacocoVersion(0, 8, 11)
 
         private final int major
         private final int minor
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.testing.jacoco.plugins.JacocoPluginExtension.xml b/subprojects/docs/src/docs/dsl/org.gradle.testing.jacoco.plugins.JacocoPluginExtension.xml
index f7fbe5e921f05..07d49471fe150 100644
--- a/subprojects/docs/src/docs/dsl/org.gradle.testing.jacoco.plugins.JacocoPluginExtension.xml
+++ b/subprojects/docs/src/docs/dsl/org.gradle.testing.jacoco.plugins.JacocoPluginExtension.xml
@@ -26,7 +26,7 @@
             </thead>
             <tr>
                 <td>toolVersion</td>
-                <td><literal>0.8.9</literal></td>
+                <td><literal>0.8.11</literal></td>
             </tr>
             <tr>
                 <td>reportsDirectory</td>
diff --git a/subprojects/docs/src/docs/userguide/releases/upgrading/upgrading_version_8.adoc b/subprojects/docs/src/docs/userguide/releases/upgrading/upgrading_version_8.adoc
index 3bae295968ade..034267bd449da 100644
--- a/subprojects/docs/src/docs/userguide/releases/upgrading/upgrading_version_8.adoc
+++ b/subprojects/docs/src/docs/userguide/releases/upgrading/upgrading_version_8.adoc
@@ -38,6 +38,13 @@ The previous step will help you identify potential problems by issuing deprecati
 [[changes_8.6]]
 == Upgrading from 8.5 and earlier
 
+=== Potential breaking changes
+
+==== Upgrade to JaCoCo 0.8.11
+
+JaCoCo has been updated to https://www.jacoco.org/jacoco/trunk/doc/changes.html[0.8.11].
+
+
 === Deprecations
 
 [[deprecated_artifact_identifier]]
diff --git a/subprojects/docs/src/snippets/testing/jacoco-quickstart/groovy/build.gradle b/subprojects/docs/src/snippets/testing/jacoco-quickstart/groovy/build.gradle
index d14cbcbcd877f..cee85a7eeedbc 100644
--- a/subprojects/docs/src/snippets/testing/jacoco-quickstart/groovy/build.gradle
+++ b/subprojects/docs/src/snippets/testing/jacoco-quickstart/groovy/build.gradle
@@ -10,7 +10,7 @@ plugins {
 
 // tag::jacoco-configuration[]
 jacoco {
-    toolVersion = "0.8.9"
+    toolVersion = "0.8.11"
     reportsDirectory = layout.buildDirectory.dir('customJacocoReportDir')
 }
 // end::jacoco-configuration[]
diff --git a/subprojects/docs/src/snippets/testing/jacoco-quickstart/kotlin/build.gradle.kts b/subprojects/docs/src/snippets/testing/jacoco-quickstart/kotlin/build.gradle.kts
index efc6c06132db9..de16cc8a1eccb 100644
--- a/subprojects/docs/src/snippets/testing/jacoco-quickstart/kotlin/build.gradle.kts
+++ b/subprojects/docs/src/snippets/testing/jacoco-quickstart/kotlin/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 
 // tag::jacoco-configuration[]
 jacoco {
-    toolVersion = "0.8.9"
+    toolVersion = "0.8.11"
     reportsDirectory = layout.buildDirectory.dir("customJacocoReportDir")
 }
 // end::jacoco-configuration[]