diff --git a/CHANGES.txt b/CHANGES.txt
index de77d25ca6..2068af26c2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -77,6 +77,9 @@
  * Update JNA library to 5.9.0 and snappy-java to version 1.1.8.4 (CASSANDRA-17040)
 
 Merged from 4.0:
+=======
+4.0.2
+ * Full Java 11 support (CASSANDRA-16894)
  * Remove unused 'geomet' package from cqlsh path (CASSANDRA-17271)
  * Removed unused 'cql' dependency (CASSANDRA-17247)
  * Don't block gossip when clearing repair snapshots (CASSANDRA-17168)
diff --git a/NEWS.txt b/NEWS.txt
index ffa909dd37..a41c470ac5 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -100,6 +100,7 @@ Deprecation
 
 New features
 ------------
+    - Full support for Java 11, it is not experimental anymore.
     - The data of the system keyspaces using a local strategy (at the exception of the system.batches,
       system.paxos, system.compaction_history, system.prepared_statements and system.repair tables)
       is now stored by default in the first data directory, instead of being distributed among all
diff --git a/doc/modules/cassandra/pages/architecture/overview.adoc b/doc/modules/cassandra/pages/architecture/overview.adoc
index 605e347830..58db6b14ba 100644
--- a/doc/modules/cassandra/pages/architecture/overview.adoc
+++ b/doc/modules/cassandra/pages/architecture/overview.adoc
@@ -98,4 +98,4 @@ written.
 
 Apache Cassandra {40_version} has added several new features including virtual
 tables, transient replication ({exper}), audit logging, full query logging, and
-support for Java 11 ({exper}). 
+support for Java 11 (full support since 4.0.2 version).
diff --git a/doc/modules/cassandra/pages/getting_started/installing.adoc b/doc/modules/cassandra/pages/getting_started/installing.adoc
index 4d4ea06ba3..77e1e6525a 100644
--- a/doc/modules/cassandra/pages/getting_started/installing.adoc
+++ b/doc/modules/cassandra/pages/getting_started/installing.adoc
@@ -14,25 +14,26 @@ limited to):
 * SUSE Enterprise Linux 12
 
 This is not an exhaustive list of operating system platforms, nor is it
-prescriptive. However users will be well-advised to conduct exhaustive
+prescriptive. However, users will be well-advised to conduct exhaustive
 tests of their own particularly for less-popular distributions of Linux.
 Deploying on older versions is not recommended unless you have previous
 experience with the older distribution in a production environment.
 
 == Prerequisites
 
-* Install the latest version of Java 8, either the
+* Install the latest version of Java 8 or Java 11, either the
 http://www.oracle.com/technetwork/java/javase/downloads/index.html[Oracle
-Java Standard Edition 8] or http://openjdk.java.net/[OpenJDK 8]. To
+Java Standard Edition 8] / http://www.oracle.com/technetwork/java/javase/downloads/index.html[Oracle Java Standard Edition 11 (Long Term Support)]
+or http://openjdk.java.net/[OpenJDK 8] / http://openjdk.java.net/[OpenJDK 11]. To
 verify that you have the correct version of java installed, type
 `java -version`.
-* *NOTE*: _Experimental_ support for Java 11 was added in Cassandra {40_version}
+* *NOTE*: Experimental support for Java 11 was added in Cassandra {40_version}
 (https://issues.apache.org/jira/browse/CASSANDRA-9608[CASSANDRA-9608]).
-Running Cassandra on Java 11 is _experimental_. Do so at your own risk.
+Full support is effective Cassandra 4.0.2 version (https://issues.apache.org/jira/browse/CASSANDRA-16894[CASSANDRA-16894])
 For more information, see
 https://github.com/apache/cassandra/blob/trunk/NEWS.txt[NEWS.txt].
 * For using cqlsh, the latest version of
-https://www.python.org/downloads/[Python 2.7] or Python 3.6+. To verify
+Python 3.6+ or Python 2.7 (support deprecated). To verify
 that you have the correct version of Python installed, type
 `python --version`.
 
diff --git a/doc/modules/cassandra/pages/new/java11.adoc b/doc/modules/cassandra/pages/new/java11.adoc
index f3efc50c1a..a61a57faf9 100644
--- a/doc/modules/cassandra/pages/new/java11.adoc
+++ b/doc/modules/cassandra/pages/new/java11.adoc
@@ -11,10 +11,8 @@ all non-LTS versions.
 One of the objectives of the Apache Cassandra 4.0 version is to support
 the recent LTS Java versions 8 and 11
 (https://issues.apache.org/jira/browse/CASSANDRA-9608[CASSANDRA-9608]).
-Java 8 and Java 11 may be used to build and run Apache Cassandra 4.0.
-
-*Note*: Support for JDK 11 in Apache Cassandra 4.0 is an experimental
-feature, and not recommended for production use.
+Java 8 and Java 11 may be used to build and run Apache Cassandra 4.0. Effective Cassandra
+4.0.2 there is full Java 11 support, it is not experimental anymore.
 
 == Support Matrix