diff --git a/_config.yml b/_config.yml
index 69f963f..875886a 100644
--- a/_config.yml
+++ b/_config.yml
@@ -15,16 +15,16 @@
 sass:
     sass_dir: _sass
 wicket:
-  version:    8.8.0
-  version_90: 9.0.0-M5
+  version:    9.0.0
+  version_90: 9.0.0
   version_80: 8.8.0
   version_70: 7.16.0
   version_60: 6.30.0
   version_15: 1.5.16
   version_14: 1.4.23
   version_13: 1.3.7
-  released:   2020-04-06
-  versions:   [6.30.0, 1.5.16, 1.4.23, 7.16.0, 8.8.0, 9.0.0-M5, 1.5-SNAPSHOT, 6.31.0-SNAPSHOT, 7.17.0-SNAPSHOT, 8.9.0-SNAPSHOT, 9.0.0-M6-SNAPSHOT]
+  released:   2020-07-15
+  versions:   [6.30.0, 1.5.16, 1.4.23, 7.16.0, 8.8.0, 9.0.0, 1.5-SNAPSHOT, 6.31.0-SNAPSHOT, 7.17.0-SNAPSHOT, 8.9.0-SNAPSHOT, 9.1.0-SNAPSHOT]
 
 live_examples_url: http://examples8x.wicket.apache.org/
 
diff --git a/content/archetype-catalog.xml b/content/archetype-catalog.xml
index 13770ad..84faca8 100644
--- a/content/archetype-catalog.xml
+++ b/content/archetype-catalog.xml
@@ -5,8 +5,8 @@
 		<archetype>
 			<groupId>org.apache.wicket</groupId>
 			<artifactId>wicket-archetype-quickstart</artifactId>
-			<version>9.0.0-M6-SNAPSHOT</version>
-			<description>Wicket 9.0.0-M6-SNAPSHOT Quickstart</description>
+			<version>9.1.0-SNAPSHOT</version>
+			<description>Wicket 9.1.0-SNAPSHOT Quickstart</description>
 		</archetype>
 
 		<archetype>
@@ -40,8 +40,8 @@
 		<archetype>
 			<groupId>org.apache.wicket</groupId>
 			<artifactId>wicket-archetype-quickstart</artifactId>
-			<version>9.0.0-M5</version>
-			<description>Wicket 9.0.0-M5 Quickstart</description>
+			<version>9.0.0</version>
+			<description>Wicket 9.0.0 Quickstart</description>
 		</archetype>
 
 		<archetype>
diff --git a/content/atom.xml b/content/atom.xml
index e2d3543..b1bd952 100644
--- a/content/atom.xml
+++ b/content/atom.xml
@@ -3,7 +3,7 @@
     <title>Apache Wicket</title>
     <link href="http://wicket.apache.org/atom.xml" rel="self"/>
     <link href="http://wicket.apache.org/"/>
-    <updated>2020-07-13T18:28:50+02:00</updated>
+    <updated>2020-07-15T10:24:44+02:00</updated>
     <id>http://wicket.apache.org/</id>
     <author>
         <name>Apache Wicket</name>
diff --git a/content/doap.rdf b/content/doap.rdf
index 7578fea..baeaa69 100644
--- a/content/doap.rdf
+++ b/content/doap.rdf
@@ -25,8 +25,8 @@
 		<release>
 			<Version>
 				<name>Latest Stable Release</name>
-				<created>2020-04-06</created>
-				<revision>8.8.0</revision>
+				<created>2020-07-15</created>
+				<revision>9.0.0</revision>
 			</Version>
 		</release>
 		<repository>
diff --git a/content/help/index.html b/content/help/index.html
index 2bdb594..f44e178 100644
--- a/content/help/index.html
+++ b/content/help/index.html
@@ -253,7 +253,7 @@
 your version is no longer maintained we kindly ask you to upgrade your
 project to a newer, maintained version of Wicket. For example if you
 have a project that depends on Wicket 1.3.7, please consider upgrading
-to Wicket 8.8.0.</p>
+to Wicket 9.0.0.</p>
 
 <h3 id="compatible">Using Compatible Versions of Supporting Libraries</h3>
 
diff --git a/content/img/wicket-9-sun.png b/content/img/wicket-9-sun.png
index 2ef4ca4..8b8fd4f 100644
--- a/content/img/wicket-9-sun.png
+++ b/content/img/wicket-9-sun.png
Binary files differ
diff --git a/content/index.html b/content/index.html
index 17be7fa..cdf8e86 100644
--- a/content/index.html
+++ b/content/index.html
@@ -211,7 +211,7 @@
 <figure class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>wicket-core<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;version&gt;</span>9.0.0-M5<span class="nt">&lt;/version&gt;</span>
+    <span class="nt">&lt;version&gt;</span>9.0.0<span class="nt">&lt;/version&gt;</span>
 <span class="nt">&lt;/dependency&gt;</span></code></pre></figure>
 
   </div>
@@ -222,8 +222,8 @@
       convenient binary package:
     </p>
     <ul>
-      <li>Source: <a href="http://www.apache.org/dyn/closer.cgi/wicket/9.0.0-M5">9.0.0-M5 source download</a></li>
-      <li>Binary: <a href="http://www.apache.org/dyn/closer.cgi/wicket/9.0.0-M5/binaries">9.0.0-M5 binary download</a></li>
+      <li>Source: <a href="http://www.apache.org/dyn/closer.cgi/wicket/9.0.0">9.0.0 source download</a></li>
+      <li>Binary: <a href="http://www.apache.org/dyn/closer.cgi/wicket/9.0.0/binaries">9.0.0 binary download</a></li>
     </ul>
   </div>
 </div>
diff --git a/content/start/download.html b/content/start/download.html
index 5f34cb8..5015876 100644
--- a/content/start/download.html
+++ b/content/start/download.html
@@ -158,24 +158,19 @@
 	</tr>
 	<tr>
 		<td><a href="wicket-9.x.html">Wicket 9.x</a></td>
-		<td>9.0.0-M5</td>
-		<td>in development</td>
+		<td>9.0.0</td>
+		<td>current, supported</td>
 	</tr>
 	<tr>
 		<td><a href="wicket-8.x.html">Wicket 8.x</a></td>
 		<td>8.8.0</td>
-		<td>current, supported</td>
+		<td>supported</td>
 	</tr>
 	<tr>
 		<td><a href="wicket-7.x.html">Wicket 7.x</a></td>
 		<td>7.16.0</td>
-		<td>supported</td>
-	</tr>
-	<tr>
-		<td><a href="wicket-6.x.html">Wicket 6.x</a></td>
-		<td>6.30.0</td>
-		<td>security fixes only, upgrade to 7.x or 8.x</td>
-	</tr>
+		<td>security fixes only, upgrade to 8.x or 9.x</td>
+	</tr>	
 </table>
 
 <p>However, if your application is not on the current branch, you should
@@ -196,34 +191,39 @@
 		<th style="width:40%">Status</th>
 	</tr>
 	<tr>
+		<td><a href="wicket-6.x.html">Wicket 6.x</a></td>
+		<td>6.30.0</td>
+		<td>discontinued, upgrade to 8.x or 9.x</td>
+	</tr>
+	<tr>
 		<td><a href="wicket-1.5.x.html">Wicket 1.5.x</a></td>
 		<td>1.5.16</td>
-		<td>discontinued, upgrade to 7.x or 8.x</td>
+		<td>discontinued, upgrade to 8.x or 9.x</td>
 	</tr>
 	<tr>
 		<td><a href="wicket-1.4.x.html">Wicket 1.4.x</a></td>
 		<td>1.4.23</td>
-		<td>discontinued, upgrade to 7.x or 8.x</td>
+		<td>discontinued, upgrade to 8.x or 9.x</td>
 	</tr>
 	<tr>
 		<td><a href="wicket-1.3.x.html">Wicket 1.3.x</a></td>
 		<td>1.3.7</td>
-		<td>discontinued, upgrade to 7.x or 8.x</td>
+		<td>discontinued, upgrade to 8.x or 9.x</td>
 	</tr>
 	<tr>
 		<td>Wicket 1.2.x</td>
 		<td>1.2.5</td>
-		<td>discontinued, upgrade to 7.x or 8.x</td>
+		<td>discontinued, upgrade to 8.x or 9.x</td>
 	</tr>
 	<tr>
 		<td>Wicket 1.1.x</td>
 		<td>1.1.0</td>
-		<td>discontinued, upgrade to 7.x or 8.x</td>
+		<td>discontinued, upgrade to 8.x or 9.x</td>
 	</tr>
 	<tr>
 		<td>Wicket 1.0.x</td>
 		<td>1.0.0</td>
-		<td>discontinued, upgrade to 7.x or 8.x</td>
+		<td>discontinued, upgrade to 8.x or 9.x</td>
 	</tr>
 </table>
 
diff --git a/content/start/quickstart.html b/content/start/quickstart.html
index 2f7d78b..550fe73 100644
--- a/content/start/quickstart.html
+++ b/content/start/quickstart.html
@@ -205,7 +205,7 @@
         <select onchange="changeIt();" id="version">
     
     
-    	<option value="9.0.0-M6-SNAPSHOT">9.0.0-M6-SNAPSHOT</option>
+    	<option value="9.1.0-SNAPSHOT">9.1.0-SNAPSHOT</option>
     
     
     
@@ -225,11 +225,11 @@
     
     
     
-    	<option value="9.0.0-M5">9.0.0-M5</option>
+    	<option value="9.0.0" selected="selected">9.0.0</option>
     
     
     
-    	<option value="8.8.0" selected="selected">8.8.0</option>
+    	<option value="8.8.0">8.8.0</option>
     
     
     
diff --git a/content/start/wicket-1.3.x.html b/content/start/wicket-1.3.x.html
index 437b909..42610d3 100644
--- a/content/start/wicket-1.3.x.html
+++ b/content/start/wicket-1.3.x.html
@@ -132,7 +132,7 @@
 <p>This branch is <strong>no longer maintained and will no longer receive any updates</strong>.</p>
 
 <p><i class="fa fa-exclamation-circle"></i>
-<strong>You should upgrade to Wicket 8.x at your earliest convenience.</strong></p>
+<strong>You should upgrade to Wicket 9.x at your earliest convenience.</strong></p>
 
 <h3 id="semantic-versioning">Semantic Versioning</h3>
 
diff --git a/content/start/wicket-1.4.x.html b/content/start/wicket-1.4.x.html
index 02b8e9c..b017ef7 100644
--- a/content/start/wicket-1.4.x.html
+++ b/content/start/wicket-1.4.x.html
@@ -132,7 +132,7 @@
 <p>This branch is <strong>no longer maintained and will no longer receive any updates</strong>.</p>
 
 <p><i class="fa fa-exclamation-circle"></i>
-<strong>You should upgrade to Wicket 8.x at your earliest convenience.</strong></p>
+<strong>You should upgrade to Wicket 9.x at your earliest convenience.</strong></p>
 
 <h3 id="semantic-versioning">Semantic Versioning</h3>
 
diff --git a/content/start/wicket-1.5.x.html b/content/start/wicket-1.5.x.html
index f7985db..f7021eb 100644
--- a/content/start/wicket-1.5.x.html
+++ b/content/start/wicket-1.5.x.html
@@ -132,7 +132,7 @@
 <p>This branch is <strong>no longer maintained and will no longer receive any updates</strong>.</p>
 
 <p><i class="fa fa-exclamation-circle"></i>
-<strong>You should upgrade to Wicket 8.x at your earliest convenience.</strong></p>
+<strong>You should upgrade to Wicket 9.x at your earliest convenience.</strong></p>
 
 <h3 id="semantic-versioning">Semantic Versioning</h3>
 
diff --git a/content/start/wicket-6.x.html b/content/start/wicket-6.x.html
index d79d2c5..6ceb417 100644
--- a/content/start/wicket-6.x.html
+++ b/content/start/wicket-6.x.html
@@ -127,14 +127,12 @@
 
 <h2 id="status">Status</h2>
 
-<p>The status for Wicket 6.x is: <strong>security fixes only</strong>.</p>
+<p>The status for Wicket 6.x is: <strong>discontinued</strong>.</p>
 
-<p>This branch is <strong>no longer actively maintained</strong> and will only recieve
-backported security fixes when relevant and as long as we are able to
-actually build this branch.</p>
+<p>This branch is <strong>no longer maintained and will no longer receive any updates</strong>.</p>
 
 <p><i class="fa fa-exclamation-circle"></i>
-<strong>You should upgrade to Wicket 8.x at your earliest convenience.</strong></p>
+<strong>You should upgrade to Wicket 9.x at your earliest convenience.</strong></p>
 
 <h3 id="semantic-versioning">Semantic Versioning</h3>
 
diff --git a/content/start/wicket-7.x.html b/content/start/wicket-7.x.html
index 893a623..3daa5dc 100644
--- a/content/start/wicket-7.x.html
+++ b/content/start/wicket-7.x.html
@@ -127,16 +127,14 @@
 
 <h2 id="status">Status</h2>
 
-<p>The status for Wicket 7.x is: <strong>supported</strong>.</p>
+<p>The status for Wicket 7.x is: <strong>security fixes only</strong>.</p>
 
-<p>This is the previous stable, production ready release of Wicket. This
-branch will continue to recieve new features, improvements, bug- and
-security fixes.</p>
+<p>This branch is <strong>no longer actively maintained</strong> and will only recieve
+backported security fixes when relevant and as long as we are able to
+actually build this branch.</p>
 
-<p><i class="fa fa-info-circle"></i>
-However, this release will cease to receive updates in the future. You
-really should consider upgrading to Wicket 8.x at your earliest
-convenience.</p>
+<p><i class="fa fa-exclamation-circle"></i>
+<strong>You should upgrade to Wicket 9.x at your earliest convenience.</strong></p>
 
 <h3 id="semantic-versioning">Semantic versioning</h3>
 
diff --git a/content/start/wicket-8.x.html b/content/start/wicket-8.x.html
index b7dfdc6..5076902 100644
--- a/content/start/wicket-8.x.html
+++ b/content/start/wicket-8.x.html
@@ -129,8 +129,12 @@
 
 <p>The status for Wicket 8.x is: <strong>supported</strong>.</p>
 
-<p>This is the current stable, <strong>production ready</strong> release of Wicket. All
-projects intended for production use should use this version.</p>
+<p>This is the previous stable, production ready release of Wicket. This branch will continue to recieve new features, improvements, bug- and security fixes.</p>
+
+<p><i class="fa fa-info-circle"></i>
+However, this release will cease to receive updates in the future. You
+really should consider upgrading to Wicket 9.x at your earliest
+convenience.</p>
 
 <h3 id="semantic-versioning">Semantic versioning</h3>
 
diff --git a/content/start/wicket-9.x.html b/content/start/wicket-9.x.html
index 2f91b35..76434fe 100644
--- a/content/start/wicket-9.x.html
+++ b/content/start/wicket-9.x.html
@@ -127,26 +127,24 @@
 
 <h2 id="status">Status</h2>
 
-<p>The status for Wicket 9.x is: <strong>in development</strong>.</p>
+<p>The status for Wicket 9.x is: <strong>supported</strong>.</p>
 
-<p>This is the current in development release of Wicket. As such,
-all projects intended for production should <strong>NOT</strong> use this version.</p>
+<p>This is the current stable, <strong>production ready</strong> release of Wicket. All
+projects intended for production use should use this version.</p>
 
 <h3 id="semantic-versioning">Semantic versioning</h3>
 
-<p>Since Wicket 9 is still in development, backward api compatibility between 
-milestone release is not guaranteed.
-We will continue to use semantic versioning when we will made Wicket 9 final 
-and maintain api compatibility between minor versions of Wicket 9.</p>
+<p>These releases follow semantic versioning so upgrades between minor
+releases will not break compatibility.</p>
 
 <h3 id="change-log">Change log</h3>
 
 <p>To see what changed in these releases you can read the
-<a href="https://www.apache.org/dist/wicket/9.0.0-M5/CHANGELOG-9.x">change log</a>.</p>
+<a href="https://www.apache.org/dist/wicket/9.0.0/CHANGELOG-9.x">change log</a>.</p>
 
 <h2 id="download">Download</h2>
 
-<p>The most recent test version in this branch is: <strong>9.0.0-M5</strong>. 
+<p>The most recent test version in this branch is: <strong>9.0.0</strong>. 
 You can test the current state of development using <a href="#maven">Maven</a> or <a href="#manually">download it manually</a>.</p>
 
 <h3 id="maven">Using Apache Maven</h3>
@@ -156,7 +154,7 @@
 <figure class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>wicket-core<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;version&gt;</span>9.0.0-M5<span class="nt">&lt;/version&gt;</span>
+    <span class="nt">&lt;version&gt;</span>9.0.0<span class="nt">&lt;/version&gt;</span>
 <span class="nt">&lt;/dependency&gt;</span></code></pre></figure>
 
 <p>Add the snippet above to your project’s POM in the dependency
@@ -174,26 +172,26 @@
 from source:</p>
 
 <ul>
-  <li>Download source <a href="http://www.apache.org/dyn/closer.cgi/wicket/9.0.0-M5/apache-wicket-9.0.0-M5.tar.gz">apache-wicket-9.0.0-M5.tar.gz</a>
-(<a href="https://www.apache.org/dist/wicket/9.0.0-M5/apache-wicket-9.0.0-M5.tar.gz.asc">PGP</a>,
-<a href="https://www.apache.org/dist/wicket/9.0.0-M5/apache-wicket-9.0.0-M5.tar.gz.sha256">SHA-256</a>
+  <li>Download source <a href="http://www.apache.org/dyn/closer.cgi/wicket/9.0.0/apache-wicket-9.0.0.tar.gz">apache-wicket-9.0.0.tar.gz</a>
+(<a href="https://www.apache.org/dist/wicket/9.0.0/apache-wicket-9.0.0.tar.gz.asc">PGP</a>,
+<a href="https://www.apache.org/dist/wicket/9.0.0/apache-wicket-9.0.0.tar.gz.sha256">SHA-256</a>
 )</li>
-  <li>Download source <a href="http://www.apache.org/dyn/closer.cgi/wicket/9.0.0-M5/apache-wicket-9.0.0-M5.zip">apache-wicket-9.0.0-M5.zip</a>
-(<a href="https://www.apache.org/dist/wicket/9.0.0-M5/apache-wicket-9.0.0-M5.zip.asc">PGP</a>,
-<a href="https://www.apache.org/dist/wicket/9.0.0-M5/apache-wicket-9.0.0-M5.zip.sha256">SHA-256</a>
+  <li>Download source <a href="http://www.apache.org/dyn/closer.cgi/wicket/9.0.0/apache-wicket-9.0.0.zip">apache-wicket-9.0.0.zip</a>
+(<a href="https://www.apache.org/dist/wicket/9.0.0/apache-wicket-9.0.0.zip.asc">PGP</a>,
+<a href="https://www.apache.org/dist/wicket/9.0.0/apache-wicket-9.0.0.zip.sha256">SHA-256</a>
 )</li>
 </ul>
 
 <p>Or use the following links to get the pre-packaged binaries instead:</p>
 
 <ul>
-  <li>Download binaries <a href="http://www.apache.org/dyn/closer.cgi/wicket/9.0.0-M5/binaries/apache-wicket-9.0.0-M5-bin.tar.gz">apache-wicket-9.0.0-M5-bin.tar.gz</a>
-(<a href="https://www.apache.org/dist/wicket/9.0.0-M5/binaries/apache-wicket-9.0.0-M5-bin.tar.gz.asc">PGP</a>,
-<a href="https://www.apache.org/dist/wicket/9.0.0-M5/binaries/apache-wicket-9.0.0-M5-bin.tar.gz.sha256">SHA-256</a>
+  <li>Download binaries <a href="http://www.apache.org/dyn/closer.cgi/wicket/9.0.0/binaries/apache-wicket-9.0.0-bin.tar.gz">apache-wicket-9.0.0-bin.tar.gz</a>
+(<a href="https://www.apache.org/dist/wicket/9.0.0/binaries/apache-wicket-9.0.0-bin.tar.gz.asc">PGP</a>,
+<a href="https://www.apache.org/dist/wicket/9.0.0/binaries/apache-wicket-9.0.0-bin.tar.gz.sha256">SHA-256</a>
 )</li>
-  <li>Download binaries <a href="http://www.apache.org/dyn/closer.cgi/wicket/9.0.0-M5/binaries/apache-wicket-9.0.0-M5-bin.zip">apache-wicket-9.0.0-M5-bin.zip</a>
-(<a href="https://www.apache.org/dist/wicket/9.0.0-M5/binaries/apache-wicket-9.0.0-M5-bin.zip.asc">PGP</a>,
-<a href="https://www.apache.org/dist/wicket/9.0.0-M5/binaries/apache-wicket-9.0.0-M5-bin.zip.sha256">SHA-256</a>
+  <li>Download binaries <a href="http://www.apache.org/dyn/closer.cgi/wicket/9.0.0/binaries/apache-wicket-9.0.0-bin.zip">apache-wicket-9.0.0-bin.zip</a>
+(<a href="https://www.apache.org/dist/wicket/9.0.0/binaries/apache-wicket-9.0.0-bin.zip.asc">PGP</a>,
+<a href="https://www.apache.org/dist/wicket/9.0.0/binaries/apache-wicket-9.0.0-bin.zip.sha256">SHA-256</a>
 )</li>
 </ul>
 
diff --git a/img/wicket-9-sun.png b/img/wicket-9-sun.png
index 2ef4ca4..8b8fd4f 100644
--- a/img/wicket-9-sun.png
+++ b/img/wicket-9-sun.png
Binary files differ
diff --git a/start/download.md b/start/download.md
index 3caaa09..3ee1001 100644
--- a/start/download.md
+++ b/start/download.md
@@ -48,23 +48,18 @@
 	<tr>
 		<td><a href="wicket-9.x.html">Wicket 9.x</a></td>
 		<td>{{site.wicket.version_90}}</td>
-		<td>in development</td>
+		<td>current, supported</td>
 	</tr>
 	<tr>
 		<td><a href="wicket-8.x.html">Wicket 8.x</a></td>
 		<td>{{site.wicket.version_80}}</td>
-		<td>current, supported</td>
+		<td>supported</td>
 	</tr>
 	<tr>
 		<td><a href="wicket-7.x.html">Wicket 7.x</a></td>
 		<td>{{site.wicket.version_70}}</td>
-		<td>supported</td>
-	</tr>
-	<tr>
-		<td><a href="wicket-6.x.html">Wicket 6.x</a></td>
-		<td>{{site.wicket.version_60}}</td>
-		<td>security fixes only, upgrade to 7.x or 8.x</td>
-	</tr>
+		<td>security fixes only, upgrade to 8.x or 9.x</td>
+	</tr>	
 </table>
 
 However, if your application is not on the current branch, you should
@@ -85,34 +80,39 @@
 		<th style="width:40%">Status</th>
 	</tr>
 	<tr>
+		<td><a href="wicket-6.x.html">Wicket 6.x</a></td>
+		<td>{{site.wicket.version_60}}</td>
+		<td>discontinued, upgrade to 8.x or 9.x</td>
+	</tr>
+	<tr>
 		<td><a href="wicket-1.5.x.html">Wicket 1.5.x</a></td>
 		<td>{{site.wicket.version_15}}</td>
-		<td>discontinued, upgrade to 7.x or 8.x</td>
+		<td>discontinued, upgrade to 8.x or 9.x</td>
 	</tr>
 	<tr>
 		<td><a href="wicket-1.4.x.html">Wicket 1.4.x</a></td>
 		<td>{{site.wicket.version_14}}</td>
-		<td>discontinued, upgrade to 7.x or 8.x</td>
+		<td>discontinued, upgrade to 8.x or 9.x</td>
 	</tr>
 	<tr>
 		<td><a href="wicket-1.3.x.html">Wicket 1.3.x</a></td>
 		<td>{{site.wicket.version_13}}</td>
-		<td>discontinued, upgrade to 7.x or 8.x</td>
+		<td>discontinued, upgrade to 8.x or 9.x</td>
 	</tr>
 	<tr>
 		<td>Wicket 1.2.x</td>
 		<td>1.2.5</td>
-		<td>discontinued, upgrade to 7.x or 8.x</td>
+		<td>discontinued, upgrade to 8.x or 9.x</td>
 	</tr>
 	<tr>
 		<td>Wicket 1.1.x</td>
 		<td>1.1.0</td>
-		<td>discontinued, upgrade to 7.x or 8.x</td>
+		<td>discontinued, upgrade to 8.x or 9.x</td>
 	</tr>
 	<tr>
 		<td>Wicket 1.0.x</td>
 		<td>1.0.0</td>
-		<td>discontinued, upgrade to 7.x or 8.x</td>
+		<td>discontinued, upgrade to 8.x or 9.x</td>
 	</tr>
 </table>
 
diff --git a/start/wicket-1.3.x.md b/start/wicket-1.3.x.md
index 1f250d3..e1b2caf 100644
--- a/start/wicket-1.3.x.md
+++ b/start/wicket-1.3.x.md
@@ -21,7 +21,7 @@
 This branch is **no longer maintained and will no longer receive any updates**.
 
 <i class="fa fa-exclamation-circle"></i>
-**You should upgrade to Wicket 8.x at your earliest convenience.**
+**You should upgrade to Wicket 9.x at your earliest convenience.**
 
 ### Semantic Versioning
 
diff --git a/start/wicket-1.4.x.md b/start/wicket-1.4.x.md
index 2dbd338..1de3ad2 100644
--- a/start/wicket-1.4.x.md
+++ b/start/wicket-1.4.x.md
@@ -21,7 +21,7 @@
 This branch is **no longer maintained and will no longer receive any updates**.
 
 <i class="fa fa-exclamation-circle"></i>
-**You should upgrade to Wicket 8.x at your earliest convenience.**
+**You should upgrade to Wicket 9.x at your earliest convenience.**
 
 ### Semantic Versioning
 
diff --git a/start/wicket-1.5.x.md b/start/wicket-1.5.x.md
index f0931eb..7e14a38 100644
--- a/start/wicket-1.5.x.md
+++ b/start/wicket-1.5.x.md
@@ -21,7 +21,7 @@
 This branch is **no longer maintained and will no longer receive any updates**.
 
 <i class="fa fa-exclamation-circle"></i>
-**You should upgrade to Wicket 8.x at your earliest convenience.**
+**You should upgrade to Wicket 9.x at your earliest convenience.**
 
 ### Semantic Versioning
 
diff --git a/start/wicket-6.x.md b/start/wicket-6.x.md
index b93ee63..63f166b 100644
--- a/start/wicket-6.x.md
+++ b/start/wicket-6.x.md
@@ -16,14 +16,12 @@
 
 ## Status
 
-The status for Wicket 6.x is: **security fixes only**.
+The status for Wicket 6.x is: **discontinued**.
 
-This branch is **no longer actively maintained** and will only recieve
-backported security fixes when relevant and as long as we are able to
-actually build this branch.
+This branch is **no longer maintained and will no longer receive any updates**.
 
 <i class="fa fa-exclamation-circle"></i>
-**You should upgrade to Wicket 8.x at your earliest convenience.**
+**You should upgrade to Wicket 9.x at your earliest convenience.**
 
 ### Semantic Versioning
 
diff --git a/start/wicket-7.x.md b/start/wicket-7.x.md
index 05c9ab0..860d0e6 100644
--- a/start/wicket-7.x.md
+++ b/start/wicket-7.x.md
@@ -16,16 +16,14 @@
 
 ## Status
 
-The status for Wicket 7.x is: **supported**.
+The status for Wicket 7.x is: **security fixes only**.
 
-This is the previous stable, production ready release of Wicket. This
-branch will continue to recieve new features, improvements, bug- and
-security fixes.
+This branch is **no longer actively maintained** and will only recieve
+backported security fixes when relevant and as long as we are able to
+actually build this branch.
 
-<i class="fa fa-info-circle"></i>
-However, this release will cease to receive updates in the future. You
-really should consider upgrading to Wicket 8.x at your earliest
-convenience.
+<i class="fa fa-exclamation-circle"></i>
+**You should upgrade to Wicket 9.x at your earliest convenience.**
 
 ### Semantic versioning
 
diff --git a/start/wicket-8.x.md b/start/wicket-8.x.md
index ea3a795..ed8f5ba 100644
--- a/start/wicket-8.x.md
+++ b/start/wicket-8.x.md
@@ -17,8 +17,12 @@
 
 The status for Wicket 8.x is: **supported**.
 
-This is the current stable, **production ready** release of Wicket. All
-projects intended for production use should use this version.
+This is the previous stable, production ready release of Wicket. This branch will continue to recieve new features, improvements, bug- and security fixes.
+
+<i class="fa fa-info-circle"></i>
+However, this release will cease to receive updates in the future. You
+really should consider upgrading to Wicket 9.x at your earliest
+convenience.
 
 ### Semantic versioning
 
diff --git a/start/wicket-9.x.md b/start/wicket-9.x.md
index a29edb9..3472779 100644
--- a/start/wicket-9.x.md
+++ b/start/wicket-9.x.md
@@ -15,17 +15,15 @@
 
 ## Status
 
-The status for Wicket 9.x is: **in development**.
+The status for Wicket 9.x is: **supported**.
 
-This is the current in development release of Wicket. As such,
-all projects intended for production should **NOT** use this version.
+This is the current stable, **production ready** release of Wicket. All
+projects intended for production use should use this version.
 
 ### Semantic versioning
 
-Since Wicket 9 is still in development, backward api compatibility between 
-milestone release is not guaranteed.
-We will continue to use semantic versioning when we will made Wicket 9 final 
-and maintain api compatibility between minor versions of Wicket 9.
+These releases follow semantic versioning so upgrades between minor
+releases will not break compatibility.
 
 ### Change log