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