diff --git a/i2p2www/pages/site/get-involved/roadmap.html b/i2p2www/pages/site/get-involved/roadmap.html
index df64bca6..f530cf1b 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 %}2020-03{% endblock %}
+{% block lastupdated %}2020-08{% endblock %}
 {% block content %}
 
 <p>
@@ -15,282 +15,13 @@ Note that we do not have a particular target for numbering a release as "1.0".
 We plan to continue numbering releases as 0.9.x for now.
 We do not maintain separate unstable and stable branches or releases.
 We have a single, stable release path.
-Our normal release cycle is 8-12 weeks.
+Our normal release cycle is 13 weeks.
 </p><p>
 Older releases are at the bottom of the page.
 </p>
 
 
 
-<h2 id="2019">2019 Vision</h2>
-<p>
-I2P connects &amp; empowers people &amp; communities to reclaim control over their privacy and security.
-The project is a platform for communication &amp; information sharing.
-It enables individuals to grow in communities with a censorship-resistant environment,
-a space to connect and communicate.
-</p>
-
-
-
-
-<h2 id="0.9.38">0.9.38</h2>
-<p><b>Released: January 22, 2019</b></p>
-<ul><li>
-New setup wizard with bandwidth testing
-</li><li>
-Beta Mac OS X installer, dock, tray enhancements
-</li><li>
-Signed Windows installer
-</li><li>
-Signed Firefox profile installer
-</li><li>
-Preliminary floodfill support for LS2
-</li><li>
-Sybil tool background analysis
-</li><li>
-Switch to Maxmind GeoLite2 GeoIP format
-</li><li>
-Switch JSON lib to json-simple, add Debian dependency
-</li><li>
-New light background
-</li><li>
-Orchid plugin fixes
-</li><li>
-AppArmor fixes
-</li><li>
-Continue work on ECIES-X25519 support (proposal #144)
-</li></ul>
-
-
-
-<h2 id="0.9.39">0.9.39</h2>
-<p><b>Released: March 21, 2019</b></p>
-<ul><li>
-Redesigned website home page
-</li><li>
-Reduce themes (ticket #2272)
-</li><li>
-Replacement icons for console home page
-</li><li>
-Continue work on testnet
-</li><li>
-Floodfill and client encrypted LS2 support (proposal #123)
-</li><li>
-LS2 client-side support (proposal #123)
-</li><li>
-Add option to disable NTCP1
-</li><li>
-Bundle i2pcontrol
-</li><li>
-AppArmor fixes
-</li><li>
-starting investigation of zerodeps jre
-</li><li>
-starting investigation of monolithic installer
-</li><li>
-Have apt-transport-i2p and all of its dependencies on-track for inclusion in Debian
-(sam3 and gosam, the Go i2p application libraries), include in PPA/Project repo
-</li><li>
-Write beginner application development guides for SAM applications
-</li><li>
-Start community PPA and application development (sub)forums
-</li><li>
-Write materials for newbies on Medium
-</li><li>
-Complete preferences dialog on the OSX Launcher
-</li><li>
-Feature for running devbuilds with OSX Launcher
-</li></ul>
-
-
-
-<h2 id="0.9.40">0.9.40</h2>
-<p><b>Released: May 7, 2019</b></p>
-<ul><li>
-New icons
-</li><li>
-I2CP and router support for decrypting LS2 (proposal #123)
-</li><li>
-Router decryption of LS2 support (proposal #123)
-</li><li>
-Router-side meta LS2 support (proposal #123)
-</li><li>
-Continue work on ECIES-X25519 support (proposal #144)
-</li><li>
-Start work on Network ID detection (proposal #147)
-</li><li>
-Start work on BLAKE2b sig types (proposal #148)
-</li><li>
-Implement base 32 for encrypted LS2 (proposal #149)
-</li><li>
-Document protocol for meta LS2 backend (proposal #150)
-</li><li>
-Disable NTCP1
-</li><li>
-Signed Windows installer
-</li><li>
-Scripted connection filter for streaming
-</li><li>
-geti2p/i2p docker image available at our download page
-</li><li>
-osx: theme selection
-</li><li>
-osx: auto updater
-</li><li>
-osx: upgrade to newer swift version
-</li><li>
-Browser identity management UI WebExtension for i2p Browser build
-</li><li>
-Browser tunnel identity management UI WebExtension for i2p Browser build
-</li><li>
-Browser news/documentation inclusion WebExtension for i2p Browser build
-</li><li>
-Onboarding improvements
-</li><li>
-Self-installing client/service demos for nginx(server only), ssh/sshd, and Mattermost client/server using split i2ptunnel configuration and apt
-</li><li>
-Port any maintainable, i2p-native bittorrent client to be apt-get installable in Debian, likely BiglyBT or XD
-</li><li>
-Produce ISO for "I2P Linux Distro Redux" Project using these features
-</li><li>
-Fix I2P-bote Android
-</li><li>
-Fix I2P-bote seeds
-</li><li>
-goSam - Up to SAM 3.2, better default signatures.
-</li><li>
-sam3 - Up to SAM 3.2, better default signatures. Streaming, datagrams, and raw. General improvements.
-</li><li>
-jsam - Further development
-</li><li>
-Better support / encourage translation efforts
-</li><li>
-Android fixes
-</li></ul>
-
-
-
-
-
-<h2 id="0.9.41">0.9.41</h2>
-<p><b>Released: July 3, 2019</b></p>
-<ul><li>
-Redesigned website navigation menu
-</li><li>
-New console icons and logos
-</li><li>
-Router-side meta LS2 support (proposal #123)
-</li><li>
-UI for per-client encrypted LS2 (proposal #123)
-</li><li>
-Continue work on ECIES-X25519 support (proposal #144)
-</li><li>
-Implement base 32 for encrypted LS2 (proposal #149)
-</li><li>
-GMP 6.1.2 (ticket #1869), partial
-</li><li>
-Wrapper 3.5.39
-</li><li>
-Wrapper for armv7 and aarch64
-</li><li>
-IzPack 5 for non-Windows installers
-</li><li>
-browser: new release, upstream tor changes, minor changes
-</li><li>
-Browser identity management UI WebExtension for i2p Browser build
-</li><li>
-Browser news/documentation inclusion WebExtension for i2p Browser build
-</li><li>
-Android GMP 6 and 64-bit jbigi
-</li><li>
-Android fixes
-</li></ul>
-
-
-
-<h2 id="0.9.42">0.9.42</h2>
-<p><b>Released: August 27, 2019</b></p>
-<ul><li>
-Browser web extensions
-</li><li>
-Self-installing demos of popular apps/services
-</li><li>
-ISO for Linux distro
-</li><li>
-Translation efforts
-</li><li>
-ECIES Proposal 144 (continuing)
-</li><li>
-GMP 6.1.2
-</li><li>
-Network ID detection Prop 147
-</li><li>
-Split configuration
-</li><li>
-Android fixes
-</li></ul>
-
-
-
-<h2 id="0.9.43">0.9.43</h2>
-<p><b>Released: October 22, 2019</b></p>
-<ul><li>
-Docker image documentation and promotion to first-class product
-</li><li>
-I2P browser: Embed router
-</li><li>
-I2P browser: Delay the user dialog
-</li><li>
-I2P browser: JSON-RPC2 client for router communication
-</li><li>
-I2P browser: Fix NoScript
-</li><li>
-I2P browser releases: beta 5, 6; v3.0 based on 68.1 ESR
-</li><li>
-I2CP blinding info message
-</li><li>
-Proxy page for encrypted LS2 credentials
-</li><li>
-Android client library release
-</li><li>
-ECIES Proposal 144 (continuing)
-</li><li>
-Setup wizard improvements
-</li><li>
-Revamped website navigation menu
-</li><li>
-Android fixes
-</li><li>
-Android battery permission
-</li></ul>
-
-
-<h2 id="0.9.44">0.9.44</h2>
-<p><b>Released: December 1, 2019</b></p>
-<ul><li>
-Testnet k8s definitions
-</li><li>
-ruby gem (ji2p, initial code to be used to control many routers in k8s)
-</li><li>
-k8s internal communication test with routers using network impl. flannel
-</li><li>
-k8s ingress definitions (how to make outside contact the router(s) inside k8s)
-</li><li>
-I2P Browser: See <a href="../browser/roadmap">Browser roadmap</a>
-</li><li>
-IPv6 fixes
-</li><li>
-SSU performance improvements
-</li><li>
-Faster router startup
-</li><li>
-Console improvements
-</li><li>
-ECIES Proposal 144 initial implementation
-</li><li>
-Donation page redesign and backend (development)
-</li></ul>
-
 
 <h2 id="0.9.45">0.9.45</h2>
 <p><b>Released: February 25, 2020</b></p>
@@ -348,48 +79,24 @@ Susi Mail Light & Dark
 
 
 <h2 id="0.9.46">0.9.46</h2>
-<p><b>Target release: Late May 2020</b></p>
+<p><b>Released: May 25, 2020</b></p>
 <ul><li>
 Replace jrobin with rrd4j
 </li><li>
 ECIES Proposal 144 testing, fixes, completion
 </li><li>
-More SSU performance improvements
+ECIES lookup replies
 </li><li>
-Begin work on other proposals (152, 153, SSU2?)
+i2ptunnel edit page redesign
 </li><li>
-Outproxy requirements
+Streaming performance improvements
 </li><li>
 Start migrating deb.i2p2.no
 </li><li>
-Auto-update server for OSX installer
-</li><li>
-I2PControl expansion for new console prototype
-</li><li>
-finish ji2p-cluster which adds the k8s part of the code
-</li><li>
-Donation page redesign and backend (deployment)
-</li><li>
-New console prototype
-</li><li>
-Enable setting up the Jetty eepSite with a custom directory from the I2PTunnel Wizard (Or otherwise enable serving a static directory of files using only I2PTunnel)
-</li><li>
 Android fixes
 </li><li>
 Long-term strategy for website
 </li><li>
-Identify and Publish information about critical infrastructures(VCS, website, reseeds, repositories, mirrors)
-</li><li>
-Publish reasonable contact information for infrastructure admins
-</li><li>
-Publish log retention policy Recommendations and Guidelines for service admins
-</li><li>
-In depth blog entries on: Site Hosting/Service operation, Project Services, Policy Recommendations
-</li><li>
-Release(Tag)-time "git bundle" generation and distribution by either HTTP or Bittorrent.
-</li><li>
-git-remote-i2p research(gittorrent branch project, eventual feature in gittorrent)
-</li><li>
 Identity and Values Workshops
 </li><li>
 Branding Foundations Work
@@ -400,25 +107,32 @@ Console Interface Redesign prototypes
 </li><li>
 Console Interface Usability Testing
 </li><li>
-Windows Installer "Install as Windows Service" bugfixes and improvements.
+Reproducible build fix
 </li><li>
-Snark UI improvements - Snark RPC inclusion
+Streaming fixes
 </li><li>
-Snark in the Browser: Handle magnet links and torrent files on web pages as if they were web resources.
-</li><li>
-Snark in the Browser: Demo a torrent-backed web page.
+UPnP fixes
 </li>
 </ul>
 
 
 
-<h2 id="2H2020">2nd Half 2020 0.9.47-48</h2>
+<h2 id="0.9.47">0.9.47</h2>
+-<p><b>Target release: Late August 2020</b></p>
 <ul><li>
-Start work on SSU2
+Require Java 8
 </li><li>
-Readthedocs support?
+Jetty 9.3.x
 </li><li>
-OSX right-click share to Snark
+json-simple 2.3.0
+</li><li>
+RRD4j 3.6
+</li><li>
+ECIES enabled by default for some tunnels
+</li><li>
+Increase streaming MTU for ECIES connections
+</li><li>
+Enable Sybil analysis and blocking by default
 </li><li>
 Begin transition to Git
 </li><li>
@@ -432,12 +146,8 @@ Bug Fixes on Android versions later than 8.0
 </li><li>
 Hide empty sections on router console home page
 </li><li>
-Update onboarding information in router console readme
-</li><li>
 Operators guides for reseed services
 </li><li>
-Revise CSS on the default I2P site to resemble console Light theme
-</li><li>
 Implement controlled vocabuary as part of Information Architecture improvements
 </li><li>
 Detailed install guide for the main I2P Java distribution
@@ -446,6 +156,62 @@ Begin implementing Information Architecture improvements to geti2p.net
 </li></ul>
 
 
+
+<h2 id="0.9.48">0.9.48</h2>
+-<p><b>Target release: November 2020</b></p>
+<ul><li>
+Start work on SSU2
+</li><li>
+More SSU performance improvements
+</li><li>
+Readthedocs support?
+</li><li>
+OSX right-click share to Snark
+</li><li>
+Continue transition to Git
+</li><li>
+Update onboarding information in router console readme
+</li><li>
+Operators guides for reseed services
+</li><li>
+Revise CSS on the default I2P site to resemble console Light theme
+</li><li>
+Windows Installer "Install as Windows Service" bugfixes and improvements.
+</li><li>
+Snark UI improvements - Snark RPC inclusion
+</li><li>
+Snark in the Browser: Handle magnet links and torrent files on web pages as if they were web resources.
+</li><li>
+Snark in the Browser: Demo a torrent-backed web page.
+</li><li>
+Identify and Publish information about critical infrastructures(VCS, website, reseeds, repositories, mirrors)
+</li><li>
+Publish reasonable contact information for infrastructure admins
+</li><li>
+Publish log retention policy Recommendations and Guidelines for service admins
+</li><li>
+In depth blog entries on: Site Hosting/Service operation, Project Services, Policy Recommendations
+</li><li>
+Release(Tag)-time "git bundle" generation and distribution by either HTTP or Bittorrent.
+</li><li>
+git-remote-i2p research(gittorrent branch project, eventual feature in gittorrent)
+</li><li>
+Auto-update server for OSX installer
+</li><li>
+I2PControl expansion for new console prototype
+</li><li>
+finish ji2p-cluster which adds the k8s part of the code
+</li><li>
+Donation page redesign and backend (deployment)
+</li><li>
+New console prototype
+</li><li>
+Enable setting up the Jetty eepSite with a custom directory from the I2PTunnel Wizard (Or otherwise enable serving a static directory of files using only I2PTunnel)
+</li><li>
+Outproxy requirements
+</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.
 {%- endtrans %}</p>
@@ -746,5 +512,262 @@ Android i2ptunnel SSL crash fix
 </li></ul>
 
 
+<h2 id="0.9.38">0.9.38</h2>
+<p><b>Released: January 22, 2019</b></p>
+<ul><li>
+New setup wizard with bandwidth testing
+</li><li>
+Beta Mac OS X installer, dock, tray enhancements
+</li><li>
+Signed Windows installer
+</li><li>
+Signed Firefox profile installer
+</li><li>
+Preliminary floodfill support for LS2
+</li><li>
+Sybil tool background analysis
+</li><li>
+Switch to Maxmind GeoLite2 GeoIP format
+</li><li>
+Switch JSON lib to json-simple, add Debian dependency
+</li><li>
+New light background
+</li><li>
+Orchid plugin fixes
+</li><li>
+AppArmor fixes
+</li><li>
+Continue work on ECIES-X25519 support (proposal #144)
+</li></ul>
+
+
+
+<h2 id="0.9.39">0.9.39</h2>
+<p><b>Released: March 21, 2019</b></p>
+<ul><li>
+Redesigned website home page
+</li><li>
+Reduce themes (ticket #2272)
+</li><li>
+Replacement icons for console home page
+</li><li>
+Continue work on testnet
+</li><li>
+Floodfill and client encrypted LS2 support (proposal #123)
+</li><li>
+LS2 client-side support (proposal #123)
+</li><li>
+Add option to disable NTCP1
+</li><li>
+Bundle i2pcontrol
+</li><li>
+AppArmor fixes
+</li><li>
+starting investigation of zerodeps jre
+</li><li>
+starting investigation of monolithic installer
+</li><li>
+Have apt-transport-i2p and all of its dependencies on-track for inclusion in Debian
+(sam3 and gosam, the Go i2p application libraries), include in PPA/Project repo
+</li><li>
+Write beginner application development guides for SAM applications
+</li><li>
+Start community PPA and application development (sub)forums
+</li><li>
+Write materials for newbies on Medium
+</li><li>
+Complete preferences dialog on the OSX Launcher
+</li><li>
+Feature for running devbuilds with OSX Launcher
+</li></ul>
+
+
+
+<h2 id="0.9.40">0.9.40</h2>
+<p><b>Released: May 7, 2019</b></p>
+<ul><li>
+New icons
+</li><li>
+I2CP and router support for decrypting LS2 (proposal #123)
+</li><li>
+Router decryption of LS2 support (proposal #123)
+</li><li>
+Router-side meta LS2 support (proposal #123)
+</li><li>
+Continue work on ECIES-X25519 support (proposal #144)
+</li><li>
+Start work on Network ID detection (proposal #147)
+</li><li>
+Start work on BLAKE2b sig types (proposal #148)
+</li><li>
+Implement base 32 for encrypted LS2 (proposal #149)
+</li><li>
+Document protocol for meta LS2 backend (proposal #150)
+</li><li>
+Disable NTCP1
+</li><li>
+Signed Windows installer
+</li><li>
+Scripted connection filter for streaming
+</li><li>
+geti2p/i2p docker image available at our download page
+</li><li>
+osx: theme selection
+</li><li>
+osx: auto updater
+</li><li>
+osx: upgrade to newer swift version
+</li><li>
+Browser identity management UI WebExtension for i2p Browser build
+</li><li>
+Browser tunnel identity management UI WebExtension for i2p Browser build
+</li><li>
+Browser news/documentation inclusion WebExtension for i2p Browser build
+</li><li>
+Onboarding improvements
+</li><li>
+Self-installing client/service demos for nginx(server only), ssh/sshd, and Mattermost client/server using split i2ptunnel configuration and apt
+</li><li>
+Port any maintainable, i2p-native bittorrent client to be apt-get installable in Debian, likely BiglyBT or XD
+</li><li>
+Produce ISO for "I2P Linux Distro Redux" Project using these features
+</li><li>
+Fix I2P-bote Android
+</li><li>
+Fix I2P-bote seeds
+</li><li>
+goSam - Up to SAM 3.2, better default signatures.
+</li><li>
+sam3 - Up to SAM 3.2, better default signatures. Streaming, datagrams, and raw. General improvements.
+</li><li>
+jsam - Further development
+</li><li>
+Better support / encourage translation efforts
+</li><li>
+Android fixes
+</li></ul>
+
+
+
+
+
+<h2 id="0.9.41">0.9.41</h2>
+<p><b>Released: July 3, 2019</b></p>
+<ul><li>
+Redesigned website navigation menu
+</li><li>
+New console icons and logos
+</li><li>
+Router-side meta LS2 support (proposal #123)
+</li><li>
+UI for per-client encrypted LS2 (proposal #123)
+</li><li>
+Continue work on ECIES-X25519 support (proposal #144)
+</li><li>
+Implement base 32 for encrypted LS2 (proposal #149)
+</li><li>
+GMP 6.1.2 (ticket #1869), partial
+</li><li>
+Wrapper 3.5.39
+</li><li>
+Wrapper for armv7 and aarch64
+</li><li>
+IzPack 5 for non-Windows installers
+</li><li>
+browser: new release, upstream tor changes, minor changes
+</li><li>
+Browser identity management UI WebExtension for i2p Browser build
+</li><li>
+Browser news/documentation inclusion WebExtension for i2p Browser build
+</li><li>
+Android GMP 6 and 64-bit jbigi
+</li><li>
+Android fixes
+</li></ul>
+
+
+
+<h2 id="0.9.42">0.9.42</h2>
+<p><b>Released: August 27, 2019</b></p>
+<ul><li>
+Browser web extensions
+</li><li>
+Self-installing demos of popular apps/services
+</li><li>
+ISO for Linux distro
+</li><li>
+Translation efforts
+</li><li>
+ECIES Proposal 144 (continuing)
+</li><li>
+GMP 6.1.2
+</li><li>
+Network ID detection Prop 147
+</li><li>
+Split configuration
+</li><li>
+Android fixes
+</li></ul>
+
+
+
+<h2 id="0.9.43">0.9.43</h2>
+<p><b>Released: October 22, 2019</b></p>
+<ul><li>
+Docker image documentation and promotion to first-class product
+</li><li>
+I2P browser: Embed router
+</li><li>
+I2P browser: Delay the user dialog
+</li><li>
+I2P browser: JSON-RPC2 client for router communication
+</li><li>
+I2P browser: Fix NoScript
+</li><li>
+I2P browser releases: beta 5, 6; v3.0 based on 68.1 ESR
+</li><li>
+I2CP blinding info message
+</li><li>
+Proxy page for encrypted LS2 credentials
+</li><li>
+Android client library release
+</li><li>
+ECIES Proposal 144 (continuing)
+</li><li>
+Setup wizard improvements
+</li><li>
+Revamped website navigation menu
+</li><li>
+Android fixes
+</li><li>
+Android battery permission
+</li></ul>
+
+
+<h2 id="0.9.44">0.9.44</h2>
+<p><b>Released: December 1, 2019</b></p>
+<ul><li>
+Testnet k8s definitions
+</li><li>
+ruby gem (ji2p, initial code to be used to control many routers in k8s)
+</li><li>
+k8s internal communication test with routers using network impl. flannel
+</li><li>
+k8s ingress definitions (how to make outside contact the router(s) inside k8s)
+</li><li>
+I2P Browser: See <a href="../browser/roadmap">Browser roadmap</a>
+</li><li>
+IPv6 fixes
+</li><li>
+SSU performance improvements
+</li><li>
+Faster router startup
+</li><li>
+Console improvements
+</li><li>
+ECIES Proposal 144 initial implementation
+</li><li>
+Donation page redesign and backend (development)
+</li></ul>
 
 {% endblock %}