diff --git a/CHANGES.txt b/CHANGES.txt
index b922b57a02..c54c0d3ffc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -196,6 +196,7 @@
  * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781)
  * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787)
 Merged from 5.0:
+ * Full Java 17 support (CASSANDRA-20681)
  * Ensure replica filtering protection does not trigger unnecessary short read protection reads (CASSANDRA-20639)
  * Unified Compaction does not properly validate min and target sizes (CASSANDRA-20398)
  * Avoid lambda usage in TrieMemoryIndex range queries and ensure queue size tracking is per column (CASSANDRA-20668)
diff --git a/doc/modules/cassandra/pages/reference/java17.adoc b/doc/modules/cassandra/pages/reference/java17.adoc
index 1ec3aab36e..645711a668 100644
--- a/doc/modules/cassandra/pages/reference/java17.adoc
+++ b/doc/modules/cassandra/pages/reference/java17.adoc
@@ -8,7 +8,7 @@ the vertical axis and the run version is along the horizontal axis.
 [width="68%",cols="34%,30%,36%",]
 |===
 | | Java 11 (Run) | Java 17 (Run)
-| Java 11 (Build) | Supported | Experimental Support
+| Java 11 (Build) | Supported | Supported
 | Java 17(Build) | Not Supported | Experimental in CI
 |===