diff --git a/docs/index.html b/docs/index.html
index 1e27b659768..acf482b512c 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -16,6 +16,16 @@
 
 <h1>News</h1>
 
+<h2>June 3, 2018</h2>
+<p>
+<a href="relnotes/18.0.5.html">Mesa 18.0.5</a> is released.
+This is a bug-fix release.
+<br>
+NOTE: It is anticipated that 18.0.5 will be the final release in the
+18.0 series. Users of 18.0 are encouraged to migrate to the 18.1
+series in order to obtain future fixes.
+</p>
+
 <h2>June 1, 2018</h2>
 <p>
 <a href="relnotes/18.1.1.html">Mesa 18.1.1</a> is released.
diff --git a/docs/release-calendar.html b/docs/release-calendar.html
index ef4d703d303..1caa2a77336 100644
--- a/docs/release-calendar.html
+++ b/docs/release-calendar.html
@@ -39,13 +39,6 @@ if you'd like to nominate a patch in the next stable release.
 <th>Notes</th>
 </tr>
 <tr>
-<td rowspan="1">18.0</td>
-<td>2018-06-01</td>
-<td>18.0.5</td>
-<td>Juan A. Suarez Romero</td>
-<td>Last planned 18.0.x release</td>
-</tr>
-<tr>
 <td rowspan="6">18.1</td>
 <td>2018-06-15</td>
 <td>18.1.2</td>
diff --git a/docs/relnotes.html b/docs/relnotes.html
index a4a3eb28404..0c594d2b7b7 100644
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -21,6 +21,7 @@ The release notes summarize what's new or changed in each Mesa release.
 </p>
 
 <ul>
+<li><a href="relnotes/18.0.5.html">18.0.5 release notes</a>
 <li><a href="relnotes/18.1.1.html">18.1.1 release notes</a>
 <li><a href="relnotes/18.1.0.html">18.1.0 release notes</a>
 <li><a href="relnotes/18.0.4.html">18.0.4 release notes</a>