diff --git a/i2p2www/blog/2019/05/07/0.9.40-Release.draft.rst b/i2p2www/blog/2019/05/07/0.9.40-Release.draft.rst
new file mode 100644
index 0000000000000000000000000000000000000000..66fe9e9f77fcc860cdd68f33185643fa70ddb14f
--- /dev/null
+++ b/i2p2www/blog/2019/05/07/0.9.40-Release.draft.rst
@@ -0,0 +1,79 @@
+===========================================
+{% trans -%}0.9.34 Release{%- endtrans %}
+===========================================
+
+.. meta::
+ :author: zzz
+ :date: 2019-05-07
+ :category: release
+ :excerpt: {% trans %}0.9.40 with new icons{% endtrans %}
+
+{% trans -%}
+Update details
+{%- endtrans %}
+==============
+
+{% trans -%}
+0.9.40 includes support for the new encrypted leaseset format.
+We disabled the old NTCP 1 transport protocol.
+There's a new SusiDNS import feature, and a new scripted filtering mechanism for incoming connections.
+{%- endtrans %}
+
+{% trans -%}
+We've made a lot of improvements to the OSX native installer, and we've updated the IzPack installer as well.
+The work continues on refreshing the console with new icons.
+As usual, we've fixed lots of bugs as well!
+{%- endtrans %}
+
+{% trans -%}
+As usual, we recommend that you update to this release. The best way to
+maintain security and help the network is to run the latest release.
+{%- endtrans %}
+
+
+**{% trans %}RELEASE DETAILS{% endtrans %}**
+
+**{% trans %}Changes{% endtrans %}**
+
+- {% trans %}Change installer to IzPack 5.1.3{% endtrans %}
+- {% trans %}Change Windows installer from launch4j to izpack2exe{% endtrans %}
+- {% trans %}Sign Windows installer{% endtrans %}
+- {% trans %}Console, SusiDNS: New icons{% endtrans %}
+- {% trans %}Disable NTCP 1{% endtrans %}
+- {% trans %}New SusiDNS import feature{% endtrans %}
+- {% trans %}Add UI and router support for Encrypted LS2 (proposal 123){% endtrans %}
+- {% trans %}Add support for new base 32 format for Encrypted LS2{% endtrans %}
+- {% trans %}New incoming connection filter for i2ptunnel{% endtrans %}
+- {% trans %}Add Red25519 signature type option for server tunnels{% endtrans %}
+- {% trans %}OSX: Theme selection, auto updater, upgrade to newer swift version{% endtrans %}
+
+
+**{% trans %}Bug Fixes{% endtrans %}**
+
+- {% trans %}Several fixes for Android{% endtrans %}
+- {% trans %}Fixes for SSU disabled (NTCP only){% endtrans %}
+- {% trans %}Fixes for encrypted LS2 (proposal 123){% endtrans %}
+- {% trans %}Fix for rare 100% CPU in NTCP{% endtrans %}
+- {% trans %}Fixes for NTCP 1 disabled{% endtrans %}
+
+
+**{% trans %}Other{% endtrans %}**
+
+- {% trans %}New supported Docker image{% endtrans %}
+- {% trans %}Support for SAM 3.2 features in SAM libraries{% endtrans %}
+- {% trans %}Remove connect delay, profile, and I2CP options in i2ptunnel UI{% endtrans %}
+- Tomcat 8.5.40
+- {% trans %}Translation updates{% endtrans %}
+- {% trans %}Update GeoIP data{% endtrans %}
+
+
+`{% trans %}Full list of fixed bugs{% endtrans %}`__
+
+__ http://{{ i2pconv('trac.i2p2.i2p') }}/query?resolution=fixed&milestone=0.9.40
+
+
+**{% trans %}SHA256 Checksums:{% endtrans %}**
+
+::
+
+
diff --git a/i2p2www/pages/site/get-involved/roadmap.html b/i2p2www/pages/site/get-involved/roadmap.html
index 86680bd500d363959af4dccd9114c1af29ae55d8..f6afed20cd7d51e3ab240426cb90d0aded07e94f 100644
--- a/i2p2www/pages/site/get-involved/roadmap.html
+++ b/i2p2www/pages/site/get-involved/roadmap.html
@@ -107,7 +107,7 @@ Feature for running devbuilds with OSX Launcher
<h2 id="0.9.40">0.9.40</h2>
<p><b>Target release date: Week of May 6, 2019</b></p>
<ul><li>
-Refactor CSS in console to point to consolidated icons
+New icons
</li><li>
I2CP and router support for decrypting LS2 (proposal #123)
</li><li>
@@ -131,8 +131,6 @@ Signed Windows installer
</li><li>
Scripted connection filter for streaming
</li><li>
-i2psnark UI performance
-</li><li>
geti2p/i2p docker image available at our download page
</li><li>
osx: theme selection
@@ -143,6 +141,8 @@ 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
@@ -155,8 +155,6 @@ Produce ISO for "I2P Linux Distro Redux" Project using these features
</li><li>
Fix I2P-bote?
</li><li>
-Browser tunnel identity management UI WebExtension for i2p Browser build
-</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.
@@ -195,8 +193,6 @@ Scripted connection filter for streaming
</li><li>
Continue work on testnet
</li><li>
-i2psnark UI performance
-</li><li>
libsam: example with ANC integration
</li><li>
libsam: use the best from the duplicated libraries making one improved one
diff --git a/i2p2www/spec/proposals/150-garlic-farm-protocol.rst b/i2p2www/spec/proposals/150-garlic-farm-protocol.rst
index 50e9e7f63214d13be63d35b66b23f8a4a6c77e93..e0bdf741400b1aeb9fc2ec9325228833c03b0927 100644
--- a/i2p2www/spec/proposals/150-garlic-farm-protocol.rst
+++ b/i2p2www/spec/proposals/150-garlic-farm-protocol.rst
@@ -133,7 +133,6 @@ All values are unsigned big-endian.
Message type: 1 byte
Source: ID, 4 byte integer
Destination: ID, 4 byte integer
- Destination: Usually the actual destination ID (see notes), 4 byte integer
Term: Current term (or candidate term for RequestVoteRequest), 8 byte integer
Last Log Term: 8 byte integer
Last Log Index: 8 byte integer
@@ -266,8 +265,7 @@ This is included only in a InstallSnapshotRequest message.
{% highlight lang='dataspec' %}
-Message type: 1 byte
- Last Log Index: 8 byte integer
+Last Log Index: 8 byte integer
Last Log Term: 8 byte integer
Config data len: In bytes, 4 byte integer
Config data: length as specified
@@ -325,6 +323,9 @@ Notes
Issues
======
+- There's no way for a client to find out about and connect to an unknown leader.
+ It would be a minor change for a Follower to send the Configuration as a Log Entry in the AppendEntriesResponse.
+
Migration