diff --git a/i2p2www/pages/site/get-involved/roadmap.html b/i2p2www/pages/site/get-involved/roadmap.html
index 47647e857c0a4325bc61bc69894830b0fe1c3a57..3c179cf4b504bf901a108cde213b8f6878bcdb1e 100644
--- a/i2p2www/pages/site/get-involved/roadmap.html
+++ b/i2p2www/pages/site/get-involved/roadmap.html
@@ -1,6 +1,6 @@
 {% extends "global/layout.html" %}
 {% block title %}{{ _('Roadmap') }}{% endblock %}
-{% block lastupdated %}{% trans %}January 2017{% endtrans %}{% endblock %}
+{% block lastupdated %}{% trans %}April 2017{% endtrans %}{% endblock %}
 {% block content %}
 
 <p>
@@ -135,7 +135,7 @@ Bug fixes, translation updates, geoip updates
 
 
 <h2 id="v0.9.29">0.9.29</h2>
-<p><b>Target release date: February 27, 2017</b></p>
+<p><b>Released: February 27, 2017</b></p>
 <ul><li>
 More fixes for Java 9
 </li><li>
@@ -161,15 +161,35 @@ Bug fixes, translation updates, geoip updates
 
 
 <h2 id="v0.9.30">0.9.30</h2>
-<p><b>Target release date: Mid-April 2017</b></p>
+<p><b>Target release date: Week of May 1, 2017</b></p>
 <ul><li>
-ElGamal speedups
+Hidden service server sigtype migration (publish dual LS)
 </li><li>
-Initial work on crypto migration for existing hidden services
+Tomcat 8 / Jetty 9.2
 </li><li>
-Fix and enable linux tray app
+Stretch/Zesty support
 </li><li>
-Further work on pluggable transports: obfs4 as a plugin
+i2ptunnel authentication page improvements and fixes
+</li><li>
+Introducer expiration (proposal #133)
+</li><li>
+I2PBote release 0.4.6
+</li><li>
+i2psnark-rpc plugin
+</li><li>
+Bug fixes, translation updates, geoip updates
+</li></ul>
+
+
+
+<h2 id="v0.9.31">0.9.31</h2>
+<p><b>Target release date: Late June / early July 2017</b></p>
+<ul><li>
+EdDSA updates
+</li><li>
+ElGamal speedups
+</li><li>
+Fix and enable linux tray app
 </li><li>
 Private test net setup improvements
 </li><li>
@@ -184,14 +204,8 @@ Review ElGamal website docs
 </li><li>
 Initial research on ElGamal replacement ("new crypto")
 </li><li>
-i2ptunnel authentication page improvements
-</li><li>
 New CSS for website front page
 </li><li>
-Console redesign phase 1 ("refresh") (ticket #738)
-</li><li>
-Move /peers HTML code to console, remove from Android
-</li><li>
 Capacity improvements: discussions and research
 </li><li>
 Create proposal and research multipath and path-awareness via I2CP
@@ -212,24 +226,14 @@ Android wakelock fix
 </li><li>
 Unit test improvements
 </li><li>
-Bug fixes, translation updates, geoip updates
-</li></ul>
-
-
-
-<h2 id="v0.9.31">0.9.31</h2>
-<p><b>Target release date: Mid-June 2017</b></p>
-<ul><li>
 GMP 6.1.1 (ticket #1869), possibly partial
 </li><li>
-Implement hidden service server sigtype migration (publish dual LS)
+Console redesign phase 1 ("refresh") (ticket #738)
 </li><li>
-Tomcat 8 / Jetty 9.2 progress, possibly in a branch, migration plan
+Move /peers HTML code to console, remove from Android
 </li><li>
 New CSS for website inner pages
 </li><li>
-I2PBote release 0.4.6
-</li><li>
 Android tunnel settings
 </li><li>
 Setup wizard