diff --git a/i2p2www/pages/site/get-involved/roadmap.html b/i2p2www/pages/site/get-involved/roadmap.html
index 02fc043ee7f5c4298ae39f4c551c362f3e5887c0..7d24af6ca238bfda38e98418dd8f538f47d6bd63 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 %}March 2018{% endtrans %}{% endblock %}
+{% block lastupdated %}{% trans %}June 2018{% endtrans %}{% endblock %}
{% block content %}
<p>
@@ -260,7 +260,7 @@ User support
<h2 id="0.9.34">0.9.34</h2>
-<p><b>Target release date: Week of April 9, 2018</b></p>
+<p><b>Released: April 10, 2018</b></p>
<ul><li>
Susimail fixes, improvements, refactoring part 2
</li><li>
@@ -283,11 +283,11 @@ Bug fixes, translation updates, geoip updates
<h2 id="0.9.35">0.9.35</h2>
-<p><b>Target release date: Mid-late June 2018</b></p>
+<p><b>Released: June 26, 2018</b></p>
<ul><li>
-Jetty 9.2.23
+Jetty 9.2.24
</li><li>
-Tomcat 8.5.29
+Tomcat 8.5.30
</li><li>
Susimail folders, background sending
</li><li>
@@ -297,50 +297,72 @@ Bug fixes, translation updates, geoip updates
</li><li>
Progress on proposal #111 (NTCP2)
</li><li>
-Mac OS X installer, dock, tray enhancements
+Progress on Mac OS X installer, dock, tray enhancements
+</li></ul>
+
+
+<h2 id="0.9.36">0.9.36</h2>
+<p><b>Target release date: Late August 2018</b></p>
+<ul><li>
+NTCP2 (disabled by default)
</li><li>
-Android GMP 6 and 64-bit jbigi
+Mac OS X installer, dock, tray enhancements
</li><li>
Android fixes
</li><li>
-Bote fixes
+Research ElGamal speedups
</li><li>
-Private test net setup improvements (Docker, BSD Jails, VMs)
+Review ElGamal website docs
</li><li>
-Unit test improvements
+Progress on proposal #123
+(LS2 with multi-destination support)
</li><li>
-<b>Note: Website items TBD.</b>
-New CSS for website front page
+Initial research on ElGamal replacement ("new crypto" / proposal #142)
</li><li>
-New CSS for website inner pages
+Versioning/caps props 136/137/142/TBD
</li><li>
-Redesigned website home page
+Capacity improvements: discussions, research, preliminary
</li><li>
-Restructure website
+Streaming improvements
+</li><li>
+Performance improvements
+</li><li>
+NTCP Pumper improvements
+</li><li>
+Private test net setup improvements (Docker, BSD Jails, VMs)
+</li><li>
+Unit test improvements
</li></ul>
-<h2 id="2h2018">0.9.36 - 0.9.37 Late 2018</h2>
-<p><b>Note: To be updated June 2018</b></p>
+<h2 id="0.9.37">0.9.37</h2>
+<p><b>Target release date: November 2018</b></p>
+<p><b>Note: List to be updated in August 2018</b></p>
<ul><li>
-Debian packaging changes and improvements
+NTCP2 (enabled by default)
</li><li>
-Ready indication for Tails
+ElGamal speedups
</li><li>
-EdDSA updates
+Bote fixes
</li><li>
-ElGamal speedups
+Android GMP 6 and 64-bit jbigi
</li><li>
-Review ElGamal website docs
+<b>Note: Website items TBD.</b>
+New CSS for website front page
</li><li>
-Progress on proposal #123
-(LS2 with multi-destination support)
+New CSS for website inner pages
</li><li>
-Initial research on ElGamal replacement ("new crypto" / proposal #142)
+Redesigned website home page
</li><li>
-Versioning/caps props 136/137/142/TBD
+Restructure website
+</li><li>
+Debian packaging changes and improvements
+</li><li>
+Ready indication for Tails
+</li><li>
+EdDSA updates
</li><li>
Create proposal and research multipath and path-awareness via I2CP
</li><li>
@@ -362,8 +384,6 @@ Android profiles
</li><li>
Setup wizard
</li><li>
-Further work on pluggable transports: obfs4 as a plugin
-</li><li>
Continue research on New netdb
</li><li>
Initial work on new naming system, make sense of alternatives, kbuckets
@@ -372,36 +392,30 @@ Console redesign phase 2
</li><li>
Console UI refactor
</li><li>
-Capacity improvements: discussions and research
-</li><li>
-Streaming improvements
-</li><li>
-Performance improvements
-</li><li>
Bundle (un-pluginize) I2PControl
</li><li>
-Continue work on ElGamal replacement ("new crypto" / proposal #142)
-</li><li>
Integrated chat client?
</li><li>
-Full support for massively popular hidden services (LS2 / prop 123)
-</li><li>
-Capacity improvements
-</li><li>
-NTCP Pumper redesign
-</li><li>
-I2PTunnel socket-side NIO
+Continue work on ElGamal replacement ("new crypto" / proposal #142)
</li><li>
GMP 6.1.2 (ticket #1869), possibly partial
+</li><li>
+NTCP Pumper improvements
</li></ul>
<h2 id="2019">2019</h2>
+<p><b>Note: List to be updated in November 2018 - January 2019</b></p>
<ul><li>
-NTCP2 including new DH, AEAD (proposal #111)
+</li><li>
+NTCP Pumper redesign
+</li><li>
+I2PTunnel socket-side NIO
</li><li>
LS2 with multi-destination support (proposal #123)
</li><li>
+Full support for massively popular hidden services (LS2 / prop 123)
+</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>