5 files changed, 107 insertions, 1 deletions
diff --git a/docs/contents.html b/docs/contents.html
index 90a1a00dea0..d5455421091 100644
--- a/docs/contents.html
+++ b/docs/contents.html
@@ -84,6 +84,7 @@
 <li><a href="codingstyle.html" target="_parent">Coding Style</a>
 <li><a href="submittingpatches.html" target="_parent">Submitting patches</a>
 <li><a href="releasing.html" target="_parent">Releasing process</a>
+<li><a href="release-calendar.html" target="_parent">Release calendar</a>
 <li><a href="sourcedocs.html" target="_parent">Source Documentation</a>
 <li><a href="dispatch.html" target="_parent">GL Dispatch</a>
 </ul>
diff --git a/docs/release-calendar.html b/docs/release-calendar.html
new file mode 100644
index 00000000000..fa67987da10
--- /dev/null
+++ b/docs/release-calendar.html
@@ -0,0 +1,94 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8">
+  <title>Releasing process</title>
+  <link rel="stylesheet" type="text/css" href="mesa.css">
+</head>
+<body>
+
+<div class="header">
+  <h1>The Mesa 3D Graphics Library</h1>
+</div>
+
+<iframe src="contents.html"></iframe>
+<div class="content">
+
+<h1>Overview</h1>
+
+<p>
+Mesa provides feature/development and stable releases.
+</p>
+<p>
+The table below lists the date and release manager that is expected to do the
+specific release.
+<br>
+Take a look <a href="submittingpatches.html#criteria" target="_parent">here</a>
+if you'd like to nominate a patch in the next stable release.
+</p>
+
+<h1 id="calendar">Calendar</h1>
+
+<table border="1">
+
+<tr>
+<th>Branch</th>
+<th>Expected date</th>
+<th>Release</th>
+<th>Release manager</th>
+<th>Notes</th>
+</tr>
+<tr>
+<td rowspan="3">17.0</td>
+<td>2017-04-28</td>
+<td>17.0.5</td>
+<td>Andres Gomez</td>
+<td></td>
+</tr>
+<tr>
+<td>2017-05-12</td>
+<td>17.0.6</td>
+<td>Emil Velikov</td>
+<td></td>
+</tr>
+<tr>
+<td>2017-05-26</td>
+<td>17.0.7</td>
+<td>Emil Velikov</td>
+<td>Final planned release for the 17.0 series</td>
+</tr>
+<tr>
+<td rowspan="5">17.1</td>
+<td>2017-04-28</td>
+<td>17.1.0-rc3</td>
+<td>Emil Velikov</td>
+<td></td>
+</tr>
+<tr>
+<td>2017-05-05</td>
+<td>17.1.0-rc4</td>
+<td>Emil Velikov</td>
+<td>May be promoted to 17.1.0 final</td>
+</tr>
+<tr>
+<td>2017-05-19</td>
+<td>17.1.1</td>
+<td>Emil Velikov</td>
+<td></td>
+<tr>
+<td>2017-06-02</td>
+<td>17.1.2</td>
+<td>Emil Velikov</td>
+<td></td>
+</tr>
+<tr>
+<td>2017-06-16</td>
+<td>17.1.3</td>
+<td>Emil Velikov</td>
+<td></td>
+</tr>
+</table>
+
+</div>
+</body>
+</html>
diff --git a/docs/releasing.html b/docs/releasing.html
index fc7f2a5aff9..15df022e5f6 100644
--- a/docs/releasing.html
+++ b/docs/releasing.html
@@ -53,6 +53,9 @@ For example:
 <p>
 Releases should happen on Fridays. Delays can occur although those should be keep
 to a minimum.
+<br>
+See our <a href="release-calendar.html" target="_parent">calendar</a> for the
+date and other details for individual releases.
 </p>
 
 <h2>Feature releases</h2>
diff --git a/docs/relnotes/17.0.4.html b/docs/relnotes/17.0.4.html
index 2e2ca9ba649..16629d1bacc 100644
--- a/docs/relnotes/17.0.4.html
+++ b/docs/relnotes/17.0.4.html
@@ -36,6 +36,13 @@ c4c34ba05d48f76b45bc05bc4b6e9242077f403d63c4f0c355c7b07786de233e  mesa-17.0.4.ta
 </pre>
 
 
+<h2>Next release</h2>
+<p>
+Mesa 17.0.5 is expected in approximatelly two weeks. See the release
+<a href="../release-calendar.html#calendar" target="_parent">calendar</a>
+for details.
+</p>
+
 <h2>New features</h2>
 <p>None</p>
 
diff --git a/docs/relnotes/17.1.0.html b/docs/relnotes/17.1.0.html
index e7cfe38fac4..4f89c56ffe6 100644
--- a/docs/relnotes/17.1.0.html
+++ b/docs/relnotes/17.1.0.html
@@ -19,7 +19,8 @@
 <p>
 Mesa 17.1.0 is a new development release.
 People who are concerned with stability and reliability should stick
-with a previous release or wait for Mesa 17.1.1.
+with a previous release or wait for
+<a href="../release-calendar.html#calendar" target="_parent">Mesa 17.1.1</a>.
 </p>
 <p>
 Mesa 17.1.0 implements the OpenGL 4.5 API, but the version reported by