diff --git a/LICENSE.txt b/LICENSE.txt
index e5d7a1bf4..b77f15578 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -319,7 +319,7 @@ Applications:
    Systray (systray.jar):
    Public domain.
 
-   Tomcat 8.5.38 (jasper-runtime.jar):
+   Tomcat 8.5.40 (jasper-runtime.jar):
    (not included in most distribution packages)
    Copyright 1999-2019 The Apache Software Foundation
    See licenses/LICENSE-Apache2.0.txt
diff --git a/apps/jetty/apache-tomcat-8.5.38/NOTICE b/apps/jetty/apache-tomcat-8.5.40/NOTICE
similarity index 100%
rename from apps/jetty/apache-tomcat-8.5.38/NOTICE
rename to apps/jetty/apache-tomcat-8.5.40/NOTICE
diff --git a/apps/jetty/apache-tomcat-8.5.38/bin/tomcat-juli.jar b/apps/jetty/apache-tomcat-8.5.40/bin/tomcat-juli.jar
similarity index 86%
rename from apps/jetty/apache-tomcat-8.5.38/bin/tomcat-juli.jar
rename to apps/jetty/apache-tomcat-8.5.40/bin/tomcat-juli.jar
index 358145d5b..bbcc10b23 100644
Binary files a/apps/jetty/apache-tomcat-8.5.38/bin/tomcat-juli.jar and b/apps/jetty/apache-tomcat-8.5.40/bin/tomcat-juli.jar differ
diff --git a/apps/jetty/apache-tomcat-8.5.38/lib/el-api.jar b/apps/jetty/apache-tomcat-8.5.40/lib/el-api.jar
similarity index 90%
rename from apps/jetty/apache-tomcat-8.5.38/lib/el-api.jar
rename to apps/jetty/apache-tomcat-8.5.40/lib/el-api.jar
index 19331ad0a..ac2d20529 100644
Binary files a/apps/jetty/apache-tomcat-8.5.38/lib/el-api.jar and b/apps/jetty/apache-tomcat-8.5.40/lib/el-api.jar differ
diff --git a/apps/jetty/apache-tomcat-8.5.38/lib/jasper-el.jar b/apps/jetty/apache-tomcat-8.5.40/lib/jasper-el.jar
similarity index 91%
rename from apps/jetty/apache-tomcat-8.5.38/lib/jasper-el.jar
rename to apps/jetty/apache-tomcat-8.5.40/lib/jasper-el.jar
index 9aa899a6d..a1c7e62aa 100644
Binary files a/apps/jetty/apache-tomcat-8.5.38/lib/jasper-el.jar and b/apps/jetty/apache-tomcat-8.5.40/lib/jasper-el.jar differ
diff --git a/apps/jetty/apache-tomcat-8.5.38/lib/jasper.jar b/apps/jetty/apache-tomcat-8.5.40/lib/jasper.jar
similarity index 90%
rename from apps/jetty/apache-tomcat-8.5.38/lib/jasper.jar
rename to apps/jetty/apache-tomcat-8.5.40/lib/jasper.jar
index 8b7eb05e3..e05c241ca 100644
Binary files a/apps/jetty/apache-tomcat-8.5.38/lib/jasper.jar and b/apps/jetty/apache-tomcat-8.5.40/lib/jasper.jar differ
diff --git a/apps/jetty/apache-tomcat-8.5.38/lib/jsp-api.jar b/apps/jetty/apache-tomcat-8.5.40/lib/jsp-api.jar
similarity index 85%
rename from apps/jetty/apache-tomcat-8.5.38/lib/jsp-api.jar
rename to apps/jetty/apache-tomcat-8.5.40/lib/jsp-api.jar
index 67735e5d4..4d0a2f0ea 100644
Binary files a/apps/jetty/apache-tomcat-8.5.38/lib/jsp-api.jar and b/apps/jetty/apache-tomcat-8.5.40/lib/jsp-api.jar differ
diff --git a/apps/jetty/apache-tomcat-8.5.38/lib/tomcat-api.jar b/apps/jetty/apache-tomcat-8.5.40/lib/tomcat-api.jar
similarity index 77%
rename from apps/jetty/apache-tomcat-8.5.38/lib/tomcat-api.jar
rename to apps/jetty/apache-tomcat-8.5.40/lib/tomcat-api.jar
index afd9b7378..a34faeef7 100644
Binary files a/apps/jetty/apache-tomcat-8.5.38/lib/tomcat-api.jar and b/apps/jetty/apache-tomcat-8.5.40/lib/tomcat-api.jar differ
diff --git a/apps/jetty/apache-tomcat-8.5.38/lib/tomcat-util-scan.jar b/apps/jetty/apache-tomcat-8.5.40/lib/tomcat-util-scan.jar
similarity index 82%
rename from apps/jetty/apache-tomcat-8.5.38/lib/tomcat-util-scan.jar
rename to apps/jetty/apache-tomcat-8.5.40/lib/tomcat-util-scan.jar
index 904820c78..d1476d72a 100644
Binary files a/apps/jetty/apache-tomcat-8.5.38/lib/tomcat-util-scan.jar and b/apps/jetty/apache-tomcat-8.5.40/lib/tomcat-util-scan.jar differ
diff --git a/apps/jetty/apache-tomcat-8.5.38/lib/tomcat-util.jar b/apps/jetty/apache-tomcat-8.5.40/lib/tomcat-util.jar
similarity index 78%
rename from apps/jetty/apache-tomcat-8.5.38/lib/tomcat-util.jar
rename to apps/jetty/apache-tomcat-8.5.40/lib/tomcat-util.jar
index b4166d658..58b8f33fe 100644
Binary files a/apps/jetty/apache-tomcat-8.5.38/lib/tomcat-util.jar and b/apps/jetty/apache-tomcat-8.5.40/lib/tomcat-util.jar differ
diff --git a/build.xml b/build.xml
index b331587d7..a8141e981 100644
--- a/build.xml
+++ b/build.xml
@@ -9,7 +9,7 @@
     <property file="build.properties"/>
     <!--  When changing, also change javadoc URL in build.properties, and checksum in apps/jetty/build.xml -->
     <property name="jetty.ver" value="9.2.25.v20180606" />
-    <property name="tomcat.ver" value="8.5.38" />
+    <property name="tomcat.ver" value="8.5.40" />
 
     <!-- You probably don't want to change anything from here down -->
     <target name="help" depends="all" />
diff --git a/history.txt b/history.txt
index c552b025c..6553f95c4 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,23 @@
+2019-04-15 zzz
+ * Tomcat 8.5.40
+
+2019-04-13 zzz
+ * i2ptunnel:
+   - Config UI for encrypted ls2
+   - Display encrypted b32
+   - Disable registration authentication when encrypted
+   - Hide I2CP config in router context
+   - Disallow any encrypted LS for offline keys
+   - Fix NPE creating server tunnel
+   - Add Red25519 sigtype option for servers
+
+2019-04-10 zzz
+ * Jetty: Hide sizes and dates of directories in listings
+ * NTCP2: Allow longer padding in msg 1 if NTCP1 disabled
+
+2019-04-08 zzz
+ * Util: Fix memory leak in compressor (ticket #2471)
+
 2019-04-03 zzz
  * I2PTunnel: Start/stop POST throttle timer
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f6e6df3a5..4e28a2c8d 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 4;
+    public final static long BUILD = 5;
 
     /** for example "-test" */
     public final static String EXTRA = "";