diff --git a/i2p2www/pages/site/get-involved/roadmap.html b/i2p2www/pages/site/get-involved/roadmap.html
index ac53a906..17ec0a46 100644
--- a/i2p2www/pages/site/get-involved/roadmap.html
+++ b/i2p2www/pages/site/get-involved/roadmap.html
@@ -211,8 +211,47 @@ Bug fixes, translation updates, geoip updates
 
 <h2 id="v0.9.33">0.9.33</h2>
 <p><b>Target release date: Late January 2018</b></p>
-<p><b>Note: To be updated, not realistic</b></p>
 <ul><li>
+Reseed support for proxies
+</li><li>
+Enable tray app on OSX
+</li><li>
+Jetty 9.2.22, Tomcat 8.5.23, Wrapper 3.5.34
+</li><li>
+Console CSS fixes and improvements
+</li><li>
+Susimail fixes, improvements, refactoring part 1
+</li><li>
+Streaming bug fixes
+</li><li>
+Android fixes
+</li><li>
+Bote fixes
+</li><li>
+Debian packaging changes and improvements, dependency changes
+</li><li>
+Bug fixes, translation updates, geoip updates
+</li></ul>
+
+
+<h2 id="2018">General goals for remainder of 2018: 0.9.34 - 0.9.37</h2>
+<p>
+TBD
+</p>
+
+
+<h2 id="0.9.34">0.9.34</h2>
+<p><b>Target release date: Early April 2018</b></p>
+<p><b>Note: To be updated</b></p>
+<ul><li>
+Versioning/caps props 136/137/TBD?
+</li><li>
+Susimail fixes, improvements, refactoring part 2
+</li><li>
+Debian packaging changes and improvements
+</li><li>
+Ready indication for Tails
+</li><li>
 EdDSA updates
 </li><li>
 ElGamal speedups
@@ -258,26 +297,27 @@ GMP 6.1.1 (ticket #1869), possibly partial
 </li><li>
 New CSS for website inner pages
 </li><li>
+Android fixes
+</li><li>
+Bote fixes
+</li><li>
 Android tunnel settings
 </li><li>
 Setup wizard
 </li><li>
-Continue research on ElGamal replacement ("new crypto")
-</li><li>
 Further work on pluggable transports: obfs4 as a plugin
 </li><li>
 Bug fixes, translation updates, geoip updates
 </li></ul>
 
 
-<h2 id="2018">0.9.34-0.9.35 (April and June 2018)</h2>
-<p><b>Note: To be updated, not realistic</b></p>
+<h2 id="0.9.35">0.9.35</h2>
+<p><b>Target release date: Late June 2018</b></p>
+<p><b>Note: To be updated</b></p>
 <ul><li>
-New crypto (ElGamal replacement) further progress
+Susimail fixes, improvements, refactoring part 3
 </li><li>
-NTCP2 including new DH, AEAD (proposal #123)
-</li><li>
-LS2 with multi-destination support (proposal #111)
+Continue research on ElGamal replacement ("new crypto")
 </li><li>
 Continue research on New netdb
 </li><li>
@@ -304,6 +344,10 @@ Android profiles
 Redesigned website home page
 </li><li>
 Restructure website
+</li><li>
+Android fixes
+</li><li>
+Bote fixes
 </li>
 <li>
 Integrated chat client?
@@ -313,20 +357,31 @@ Integrated chat client?
 
 
 
-<h2 id="2h2018">Late 2018</h2>
+<h2 id="2h2018">0.9.36 - 0.9.37 Late 2018</h2>
+<p><b>Note: To be updated</b></p>
 <ul>
-<li>{% trans todo=site_url('get-involved/todo') -%}
+Complete I2PControl API 2 spec, implement in plugin (proposal #118)
+</li><li>
+Bundle (un-pluginize) I2PControl with API 2 (proposal #118)
+</li><li>
+Continue work on ElGamal replacement ("new crypto")
+</li>
+</ul>
+
+
+<h2 id="2019">2019</h2>
+<ul><li>
+NTCP2 including new DH, AEAD (proposal #123)
+</li><li>
+LS2 with multi-destination support (proposal #111)
+</li><li>
+{% trans todo=site_url('get-involved/todo') -%}
 Reachability Mapping / handle peers partially reachable / enhanced <a href="{{ todo }}#fullRestrictedRoutes">restricted routes</a>
 {%- endtrans %}</li>
 <li>{% trans %}Full restricted routes{% endtrans %}</li>
 <li>{% trans %}Tunnel mixing and padding{% endtrans %}</li>
 <li>{% trans %}User defined message delays{% endtrans %}</li>
-</li><li>
-Complete I2PControl API 2 spec, implement in plugin (proposal #118)
-</li><li>
-Bundle (un-pluginize) I2PControl with API 2 (proposal #118)
-</li>
-</ul>
+</li></ul>
 
 <p>{% trans todo=site_url('get-involved/todo') -%}
 Please see the <a href="{{ todo }}">TODO</a> list for more detailed info about some of these tasks.