diff --git a/docs/source/getting-set-up.rst b/docs/source/getting-set-up.rst
index 6116bda1b8..ff9a4d0787 100644
--- a/docs/source/getting-set-up.rst
+++ b/docs/source/getting-set-up.rst
@@ -6,6 +6,7 @@ Software requirements
 Corda uses industry-standard tools:
 
 * **Oracle JDK 8 JVM** - minimum supported version **8u171**
+.. warning:: OpenJDK is not currently supported.
 * **IntelliJ IDEA** - supported versions **2017.x** and **2018.x** (with Kotlin plugin version |kotlin_version|)
 * **Git**
 
@@ -14,9 +15,6 @@ will download the correct version of Kotlin.
 
 Please note:
 
-* Corda runs in a JVM. JVM implementations other than Oracle JDK 8 are not actively supported. However, if you do
-  choose to use OpenJDK, you will also need to `install OpenJFX <http://openjdk.java.net/install/>`_.
-
 * Applications on Corda (CorDapps) can be written in any language targeting the JVM. However, Corda itself and most of
   the samples are written in Kotlin. Kotlin is an
   `official Android language <https://developer.android.com/kotlin/index.html>`_, and you can read more about why
diff --git a/docs/source/platform-support-matrix.rst b/docs/source/platform-support-matrix.rst
index 1cd4b24c4b..daf4dd2dd4 100644
--- a/docs/source/platform-support-matrix.rst
+++ b/docs/source/platform-support-matrix.rst
@@ -3,6 +3,8 @@ Platform support matrix
 
 Our supported Operating System platforms are a subset of those supported by Java `8u172 <http://www.oracle.com/technetwork/java/javase/certconfig-2095354.html>`_. Production use of Corda Enterprise 3.0 is only supported on Linux OS, see details below.
 
+.. warning:: On all platforms listed below, only the **Oracle JDK 8 JVM 8u171\+** is supported. OpenJDK is not currently supported.
+
 Operating systems supported in production
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~