diff --git a/documentation/api/index.md b/documentation/api/index.md
index c28889c75..7564dd33e 100644
--- a/documentation/api/index.md
+++ b/documentation/api/index.md
@@ -18,7 +18,6 @@ be migrated to a state the rest of the code can work with.
 - `Java 9`
 - `Java 8`
 - `Java 7` {% include enterprise.html %}
-- `Java 6` {% include enterprise.html %}
 
 ## Download
 
diff --git a/documentation/maven/index.md b/documentation/maven/index.md
index c14b2b5d7..1bda08cb0 100644
--- a/documentation/maven/index.md
+++ b/documentation/maven/index.md
@@ -6,7 +6,7 @@ subtitle: Maven Plugin
 # Maven Plugin
 
 The Flyway Open-Source Maven plugin supports **Maven 3.x** running on **Java 8**, **Java 9**, **Java 10** or **Java 11**.
-The Flyway Enterprise Maven plugin also supports **Java 6** and **Java 7**.
+The Flyway Enterprise Maven plugin also supports **Java 7**.
 
 ## Installation
 
diff --git a/documentation/releaseNotes.html b/documentation/releaseNotes.html
index 04a198f5a..466801d56 100644
--- a/documentation/releaseNotes.html
+++ b/documentation/releaseNotes.html
@@ -9,6 +9,12 @@ <h1>Release Notes</h1>
 
 <div class="release">
     <h2 id="6.0.0">Flyway 6.0.0 (Unreleased)</h2>
+
+    <h3>Incompatible Changes</h3>
+    <ul>
+        {% include issue.html id="2188" title="Discontinue Java 6 support" enterprise=true %}
+        {% include issue.html id="2218" title="Remove deprecated APIs and settings" %}
+    </ul>
 </div>
 
 <div class="release">
diff --git a/download/index.md b/download/index.md
index 04c937c3d..f6b3d9468 100644
--- a/download/index.md
+++ b/download/index.md
@@ -36,7 +36,7 @@ Choose your Flyway edition based on the features and support level you require
 <tr><td>Streaming</td><td></td><td><i class="fa fa-check"></i></td><td><i class="fa fa-check"></i></td></tr>
 <tr><td>Display query results</td><td></td><td><i class="fa fa-check"></i></td><td><i class="fa fa-check"></i></td></tr>
 <tr><td>Older database versions compatibility</td><td></td><td></td><td><i class="fa fa-check"></i></td></tr>
-<tr><td>Java 6 / 7 compatibility</td><td></td><td></td><td><i class="fa fa-check"></i></td></tr>
+<tr><td>Java 7 compatibility</td><td></td><td></td><td><i class="fa fa-check"></i></td></tr>
 <tr><td>License</td><td><a href="/licenses/flyway-community">Apache v2</a></td><td><a href="/licenses/flyway-pro">Commercial</a></td><td><a href="/licenses/flyway-enterprise">Commercial</a></td></tr>
 <tr><td>Maven Repository</td><td><i class="fa fa-check"></i></td><td><i class="fa fa-check"></i></td><td><i class="fa fa-check"></i></td></tr>
 <tr><td>Source Code included</td><td><i class="fa fa-check"></i></td><td><i class="fa fa-check"></i></td><td><i class="fa fa-check"></i></td></tr>