diff --git a/LICENSE.txt b/LICENSE.txt
index 87b108274..9d984ce28 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -333,7 +333,7 @@ Applications:
    Systray (systray.jar):
    Public domain.
 
-   Tomcat 9.0.35 (jasper-runtime.jar):
+   Tomcat 9.0.40 (jasper-runtime.jar):
    (not included in most distribution packages)
    Copyright 1999-2020 The Apache Software Foundation
    See licenses/LICENSE-Apache2.0.txt
diff --git a/apps/jetty/apache-tomcat-9.0.35/lib/tomcat-util-scan.jar b/apps/jetty/apache-tomcat-9.0.35/lib/tomcat-util-scan.jar
deleted file mode 100644
index 36701a398..000000000
Binary files a/apps/jetty/apache-tomcat-9.0.35/lib/tomcat-util-scan.jar and /dev/null differ
diff --git a/apps/jetty/apache-tomcat-9.0.35/NOTICE b/apps/jetty/apache-tomcat-9.0.40/NOTICE
similarity index 100%
rename from apps/jetty/apache-tomcat-9.0.35/NOTICE
rename to apps/jetty/apache-tomcat-9.0.40/NOTICE
diff --git a/apps/jetty/apache-tomcat-9.0.35/bin/tomcat-juli.jar b/apps/jetty/apache-tomcat-9.0.40/bin/tomcat-juli.jar
similarity index 60%
rename from apps/jetty/apache-tomcat-9.0.35/bin/tomcat-juli.jar
rename to apps/jetty/apache-tomcat-9.0.40/bin/tomcat-juli.jar
index 55b1ff61d..3f35d8f92 100644
Binary files a/apps/jetty/apache-tomcat-9.0.35/bin/tomcat-juli.jar and b/apps/jetty/apache-tomcat-9.0.40/bin/tomcat-juli.jar differ
diff --git a/apps/jetty/apache-tomcat-9.0.35/lib/el-api.jar b/apps/jetty/apache-tomcat-9.0.40/lib/el-api.jar
similarity index 54%
rename from apps/jetty/apache-tomcat-9.0.35/lib/el-api.jar
rename to apps/jetty/apache-tomcat-9.0.40/lib/el-api.jar
index ef049b2cf..48146b3cc 100644
Binary files a/apps/jetty/apache-tomcat-9.0.35/lib/el-api.jar and b/apps/jetty/apache-tomcat-9.0.40/lib/el-api.jar differ
diff --git a/apps/jetty/apache-tomcat-9.0.35/lib/jasper-el.jar b/apps/jetty/apache-tomcat-9.0.40/lib/jasper-el.jar
similarity index 72%
rename from apps/jetty/apache-tomcat-9.0.35/lib/jasper-el.jar
rename to apps/jetty/apache-tomcat-9.0.40/lib/jasper-el.jar
index b5e6fc488..69db5d762 100644
Binary files a/apps/jetty/apache-tomcat-9.0.35/lib/jasper-el.jar and b/apps/jetty/apache-tomcat-9.0.40/lib/jasper-el.jar differ
diff --git a/apps/jetty/apache-tomcat-9.0.35/lib/jasper.jar b/apps/jetty/apache-tomcat-9.0.40/lib/jasper.jar
similarity index 74%
rename from apps/jetty/apache-tomcat-9.0.35/lib/jasper.jar
rename to apps/jetty/apache-tomcat-9.0.40/lib/jasper.jar
index 623f16315..4a22a9579 100644
Binary files a/apps/jetty/apache-tomcat-9.0.35/lib/jasper.jar and b/apps/jetty/apache-tomcat-9.0.40/lib/jasper.jar differ
diff --git a/apps/jetty/apache-tomcat-9.0.35/lib/jsp-api.jar b/apps/jetty/apache-tomcat-9.0.40/lib/jsp-api.jar
similarity index 78%
rename from apps/jetty/apache-tomcat-9.0.35/lib/jsp-api.jar
rename to apps/jetty/apache-tomcat-9.0.40/lib/jsp-api.jar
index f2e05db6e..f0e568d70 100644
Binary files a/apps/jetty/apache-tomcat-9.0.35/lib/jsp-api.jar and b/apps/jetty/apache-tomcat-9.0.40/lib/jsp-api.jar differ
diff --git a/apps/jetty/apache-tomcat-9.0.35/lib/servlet-api.jar b/apps/jetty/apache-tomcat-9.0.40/lib/servlet-api.jar
similarity index 87%
rename from apps/jetty/apache-tomcat-9.0.35/lib/servlet-api.jar
rename to apps/jetty/apache-tomcat-9.0.40/lib/servlet-api.jar
index c0016bce0..fc76a2283 100644
Binary files a/apps/jetty/apache-tomcat-9.0.35/lib/servlet-api.jar and b/apps/jetty/apache-tomcat-9.0.40/lib/servlet-api.jar differ
diff --git a/apps/jetty/apache-tomcat-9.0.35/lib/tomcat-api.jar b/apps/jetty/apache-tomcat-9.0.40/lib/tomcat-api.jar
similarity index 64%
rename from apps/jetty/apache-tomcat-9.0.35/lib/tomcat-api.jar
rename to apps/jetty/apache-tomcat-9.0.40/lib/tomcat-api.jar
index 60f93d7da..4e00854ee 100644
Binary files a/apps/jetty/apache-tomcat-9.0.35/lib/tomcat-api.jar and b/apps/jetty/apache-tomcat-9.0.40/lib/tomcat-api.jar differ
diff --git a/apps/jetty/apache-tomcat-9.0.40/lib/tomcat-util-scan.jar b/apps/jetty/apache-tomcat-9.0.40/lib/tomcat-util-scan.jar
new file mode 100644
index 000000000..ef0ca0618
Binary files /dev/null and b/apps/jetty/apache-tomcat-9.0.40/lib/tomcat-util-scan.jar differ
diff --git a/apps/jetty/apache-tomcat-9.0.35/lib/tomcat-util.jar b/apps/jetty/apache-tomcat-9.0.40/lib/tomcat-util.jar
similarity index 57%
rename from apps/jetty/apache-tomcat-9.0.35/lib/tomcat-util.jar
rename to apps/jetty/apache-tomcat-9.0.40/lib/tomcat-util.jar
index 33a6ca13b..a45f1b7ed 100644
Binary files a/apps/jetty/apache-tomcat-9.0.35/lib/tomcat-util.jar and b/apps/jetty/apache-tomcat-9.0.40/lib/tomcat-util.jar differ
diff --git a/build.xml b/build.xml
index 728010d71..ff1613567 100644
--- a/build.xml
+++ b/build.xml
@@ -12,7 +12,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.3.29.v20201019" />
-    <property name="tomcat.ver" value="9.0.35" />
+    <property name="tomcat.ver" value="9.0.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 010a0a7bd..54291c980 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,12 @@
+2020-11-20 zzz
+ * NetDB: Increase exploration rate when hidden
+ * Tomcat 9.0.40
+
+2020-11-19 zzz
+ * Build: Reproducible build fix (ticket #2279)
+ * Crypto: Adjust Java key cache sizes
+ * Debian: Update apparmor profile for usrmerge
+
 2020-11-17 zzz
  * Jetty:
    - Update to 9.3.29.v20201019
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 25340f779..421ff4f63 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 = 15;
+    public final static long BUILD = 16;
 
     /** for example "-test" */
     public final static String EXTRA = "-rc";