diff --git a/build.xml b/build.xml
index e8241b2da5b93dbc625a82807cf2ff3dc4c8dd10..f27ec1c616e78aa143284ecaebecc0da7485b8f1 100644
--- a/build.xml
+++ b/build.xml
@@ -869,8 +869,8 @@
             splitindex="true"
             failonerror="true"
             additionalparam="-notimestamp"
-            doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
-            windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
+            doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra} (API ${api.version})"
+            windowtitle="I2P Anonymous Network - Java Documentation - API Version ${api.version}">
             <group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:gnu.crypto.*:gnu.getopt:gnu.gettext:com.nettgryppa.security:org.apache.http.conn.ssl:org.apache.http.conn.util:org.apache.http.util:org.json.simple:com.southernstorm.noise.crypto.x25519:com.southernstorm.noise.crypto.chacha20:org.minidns:org.minidns.*" />
             <group title="Streaming Library" packages="net.i2p.client.streaming:net.i2p.client.streaming.impl" />
             <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:net.i2p.data.router:org.cybergarage:org.cybergarage.*:org.freenetproject:org.xlattice.crypto.filters:com.maxmind.*:com.southernstorm.noise.*" />
@@ -958,8 +958,8 @@
             packagenames="*"
             use="true"
             splitindex="true"
-            doctitle="I2P Unit Test Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
-            windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
+            doctitle="I2P Unit Test Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra} (API ${api.version})"
+            windowtitle="I2P Anonymous Network - Java Documentation - API Version ${api.version}">
             <group title="Core SDK" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:gnu.crypto.*:gnu.gettext:org:com.nettgryppa.security:net.metanotion:net.metanotion.*" />
             <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:org.cybergarage.*:org.freenetproject:org.xlattice.crypto.filters" />
             <sourcepath>
diff --git a/router/java/src/net/i2p/router/package.html b/router/java/src/net/i2p/router/package.html
index dc610cc0c6b6023bb568ba0c5dea39a45776e792..550d225cfba628fbab9010f2f90cf33b512260d0 100644
--- a/router/java/src/net/i2p/router/package.html
+++ b/router/java/src/net/i2p/router/package.html
@@ -14,5 +14,42 @@ Subject to change. Not necessarily maintained as a stable API.
 For applications bundling the I2P router, instantiate Router and call runRouter(), or use Router.main() or RouterLaunch.
 Most public methods in Router are maintained as a stable I2P for those bundling the router.
 </p>
+<p>
+Message flow:
+<pre>
+
+
+                                                                                                                              NTCP2
+                                                                                                                              Per-Conn
+
+                                                                                                                                /--- Pri Queue )
+NTCP2                                                                                                                          /        .      )                                                                      NTCP2
+                                                                                                                              /         .      )
+kernel -&gt; NIO -&gt; Reader -------------------------\                                                                           /          .      ) ---------------------------------------                       -- Writer -&gt; NIO -&gt; Kernel
+                                                  \                                 Tunnels                                 /           .      )                                        \                     /
+                                                   \                                                                       /            .      )                                         \                   /
+                                                    \                      /-- RED - Codel/Pri - Frag - \                 /             .      )                                          \                 /
+                                                     \              IBGW  /          Queue               \               /                                                                 \               /
+                                                      \                  /                                \             /                                                                   \             /
+                                                       \                /                                  \           /                                                                     \           /
+                                                        \              /  Middle hop                        \         /                                                                        Bandwidth
+                                                         -&gt; In Net --------------------- RED ------------------Out Net                                                                         Limiter
+                                                        /   Msg Pool   \                                   /   Msg Pool                                                                      /           \
+                                                       /                \                                 /            \                                                                    /             \
+                                                      /                  \                               /              \                                                                  /               \
+SSU                                                  /              OBEP  \                             /                \                                                                /                 \
+                                                    /                      \                           /                  \                                                              /                   \
+kernel -&gt; Reader -&gt; Codel -----------------&gt; Codel -                        --------------------- RED -                    \                                                            /                     \
+                    Queue \              /   Queue                            \              /                              \       SSU                                                /                       \
+                           \            /                                      \            /                                \      Per-Conn                                          /                         \
+                             Reasssembly                                         Reasssembly                                  \                                                      /                           \
+                                                                                                                               \--&gt; Pri Queue -&gt; Frag -&gt; Window/ )                  /                             \
+                                                                                                                                                         ReTX    )                 /                               \     SSU
+                                                                                                                                               .                 )                /                                 \
+                                                                                                                                               .                 ) - OMF - Codel -                                   - Writer -&gt; Kernel
+                                                                                                                                               .                 )         Queue
+                                                                                                                                               .                 )
+                                                                                                                                               .                 )
+</pre>
     </body>
 </html>