diff --git a/apps/jetty/apache-tomcat-8.5.23/bin/tomcat-juli.jar b/apps/jetty/apache-tomcat-8.5.23/bin/tomcat-juli.jar
deleted file mode 100644
index 8a616991f..000000000
Binary files a/apps/jetty/apache-tomcat-8.5.23/bin/tomcat-juli.jar and /dev/null differ
diff --git a/apps/jetty/apache-tomcat-8.5.23/lib/el-api.jar b/apps/jetty/apache-tomcat-8.5.23/lib/el-api.jar
deleted file mode 100644
index dd8c59e39..000000000
Binary files a/apps/jetty/apache-tomcat-8.5.23/lib/el-api.jar and /dev/null differ
diff --git a/apps/jetty/apache-tomcat-8.5.23/lib/jasper-el.jar b/apps/jetty/apache-tomcat-8.5.23/lib/jasper-el.jar
deleted file mode 100644
index 0e4d1dc8a..000000000
Binary files a/apps/jetty/apache-tomcat-8.5.23/lib/jasper-el.jar and /dev/null differ
diff --git a/apps/jetty/apache-tomcat-8.5.23/lib/jasper.jar b/apps/jetty/apache-tomcat-8.5.23/lib/jasper.jar
deleted file mode 100644
index fd95c2210..000000000
Binary files a/apps/jetty/apache-tomcat-8.5.23/lib/jasper.jar and /dev/null differ
diff --git a/apps/jetty/apache-tomcat-8.5.23/lib/jsp-api.jar b/apps/jetty/apache-tomcat-8.5.23/lib/jsp-api.jar
deleted file mode 100644
index 5922bf6e3..000000000
Binary files a/apps/jetty/apache-tomcat-8.5.23/lib/jsp-api.jar and /dev/null differ
diff --git a/apps/jetty/apache-tomcat-8.5.23/lib/tomcat-util-scan.jar b/apps/jetty/apache-tomcat-8.5.23/lib/tomcat-util-scan.jar
deleted file mode 100644
index dce606c9a..000000000
Binary files a/apps/jetty/apache-tomcat-8.5.23/lib/tomcat-util-scan.jar and /dev/null differ
diff --git a/apps/jetty/apache-tomcat-8.5.23/lib/tomcat-util.jar b/apps/jetty/apache-tomcat-8.5.23/lib/tomcat-util.jar
deleted file mode 100644
index a1dd20c84..000000000
Binary files a/apps/jetty/apache-tomcat-8.5.23/lib/tomcat-util.jar and /dev/null differ
diff --git a/apps/jetty/apache-tomcat-8.5.23/NOTICE b/apps/jetty/apache-tomcat-8.5.30/NOTICE
similarity index 97%
rename from apps/jetty/apache-tomcat-8.5.23/NOTICE
rename to apps/jetty/apache-tomcat-8.5.30/NOTICE
index 079e508b9..eca541e97 100644
--- a/apps/jetty/apache-tomcat-8.5.23/NOTICE
+++ b/apps/jetty/apache-tomcat-8.5.30/NOTICE
@@ -1,5 +1,5 @@
 Apache Tomcat
-Copyright 1999-2017 The Apache Software Foundation
+Copyright 1999-2018 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/apps/jetty/apache-tomcat-8.5.30/bin/tomcat-juli.jar b/apps/jetty/apache-tomcat-8.5.30/bin/tomcat-juli.jar
new file mode 100644
index 000000000..527bfbf56
Binary files /dev/null and b/apps/jetty/apache-tomcat-8.5.30/bin/tomcat-juli.jar differ
diff --git a/apps/jetty/apache-tomcat-8.5.30/lib/el-api.jar b/apps/jetty/apache-tomcat-8.5.30/lib/el-api.jar
new file mode 100644
index 000000000..1b1b3fe9f
Binary files /dev/null and b/apps/jetty/apache-tomcat-8.5.30/lib/el-api.jar differ
diff --git a/apps/jetty/apache-tomcat-8.5.30/lib/jasper-el.jar b/apps/jetty/apache-tomcat-8.5.30/lib/jasper-el.jar
new file mode 100644
index 000000000..bd36bc815
Binary files /dev/null and b/apps/jetty/apache-tomcat-8.5.30/lib/jasper-el.jar differ
diff --git a/apps/jetty/apache-tomcat-8.5.30/lib/jasper.jar b/apps/jetty/apache-tomcat-8.5.30/lib/jasper.jar
new file mode 100644
index 000000000..616da002c
Binary files /dev/null and b/apps/jetty/apache-tomcat-8.5.30/lib/jasper.jar differ
diff --git a/apps/jetty/apache-tomcat-8.5.30/lib/jsp-api.jar b/apps/jetty/apache-tomcat-8.5.30/lib/jsp-api.jar
new file mode 100644
index 000000000..24d3aa571
Binary files /dev/null and b/apps/jetty/apache-tomcat-8.5.30/lib/jsp-api.jar differ
diff --git a/apps/jetty/apache-tomcat-8.5.23/lib/tomcat-api.jar b/apps/jetty/apache-tomcat-8.5.30/lib/tomcat-api.jar
similarity index 59%
rename from apps/jetty/apache-tomcat-8.5.23/lib/tomcat-api.jar
rename to apps/jetty/apache-tomcat-8.5.30/lib/tomcat-api.jar
index 955939866..92dcd54b3 100644
Binary files a/apps/jetty/apache-tomcat-8.5.23/lib/tomcat-api.jar and b/apps/jetty/apache-tomcat-8.5.30/lib/tomcat-api.jar differ
diff --git a/apps/jetty/apache-tomcat-8.5.30/lib/tomcat-util-scan.jar b/apps/jetty/apache-tomcat-8.5.30/lib/tomcat-util-scan.jar
new file mode 100644
index 000000000..2d9a44fae
Binary files /dev/null and b/apps/jetty/apache-tomcat-8.5.30/lib/tomcat-util-scan.jar differ
diff --git a/apps/jetty/apache-tomcat-8.5.30/lib/tomcat-util.jar b/apps/jetty/apache-tomcat-8.5.30/lib/tomcat-util.jar
new file mode 100644
index 000000000..e6ddc0937
Binary files /dev/null and b/apps/jetty/apache-tomcat-8.5.30/lib/tomcat-util.jar differ
diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index a014a3453..1d9198af0 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -17,9 +17,9 @@
     <!--       Also change javadoc URL in top-level build.properties.                            -->
     <!-- jetty.branch unused until we go to 9.3 -->
     <property name="jetty.branch" value="stable-9" />
-    <property name="jetty.ver" value="9.2.22.v20170606" />
+    <property name="jetty.ver" value="9.2.24.v20180105" />
     <property name="jetty.base" value="jetty-distribution-${jetty.ver}" />
-    <property name="jetty.sha1" value="7f0b10d69b214337622e3c0565f94417828ba13e" />
+    <property name="jetty.sha1" value="a8af3941385d43eece329b09ae4a261e0cb3579c" />
     <property name="jetty.filename" value="${jetty.base}.zip" />
     <!-- change jetty.ver to jetty.branch for 9.3 -->
     <property name="jetty.url" value="http://central.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty.ver}/${jetty.filename}" />
@@ -28,7 +28,7 @@
     <property name="javac.version" value="1.7" />
 
     <!-- Note: Please change all references in top-level build.xml if you update to a new Tomcat! -->
-    <property name="tomcat.ver" value="8.5.23" />
+    <property name="tomcat.ver" value="8.5.30" />
     <!-- everything we need is in the deployer package, except for tomcat-api.jar in the full package,
          so we just use the full package instead.
       <property name="tomcat.lib" value="apache-tomcat-${tomcat.ver}-deployer/lib" />
@@ -302,10 +302,11 @@
 
             <!-- Apache package version -->
             <!-- we match what was bundled in the Jetty package version -->
+            <!-- except we need compat/ as of 8.5.29 or JspC fails in the jar scan -->
             <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper.jar"/>
             <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-api.jar"/>
             <zipfileset includes="org/apache/juli/logging/**/*" src="${tomcat.bin}/tomcat-juli.jar"/>
-            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE org/apache/tomcat/util/codec/ org/apache/tomcat/util/compat/ org/apache/tomcat/util/threads/" src="${tomcat.lib}/tomcat-util.jar"/>
+            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE org/apache/tomcat/util/codec/ org/apache/tomcat/util/threads/" src="${tomcat.lib}/tomcat-util.jar"/>
             <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-util-scan.jar"/>
         </jar>
 
diff --git a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.2.22.v20170606.jar b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.2.24.v20180105.jar
similarity index 57%
rename from apps/jetty/jetty-distribution-9.2.22.v20170606/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.2.22.v20170606.jar
rename to apps/jetty/jetty-distribution-9.2.24.v20180105/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.2.24.v20180105.jar
index 52b78673e..38049888c 100644
Binary files a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.2.22.v20170606.jar and b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.2.24.v20180105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-continuation-9.2.22.v20170606.jar b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-continuation-9.2.24.v20180105.jar
similarity index 76%
rename from apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-continuation-9.2.22.v20170606.jar
rename to apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-continuation-9.2.24.v20180105.jar
index 4d94b6648..52cf11afc 100644
Binary files a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-continuation-9.2.22.v20170606.jar and b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-continuation-9.2.24.v20180105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-deploy-9.2.22.v20170606.jar b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-deploy-9.2.24.v20180105.jar
similarity index 85%
rename from apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-deploy-9.2.22.v20170606.jar
rename to apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-deploy-9.2.24.v20180105.jar
index c7d559aae..fe9c116b9 100644
Binary files a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-deploy-9.2.22.v20170606.jar and b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-deploy-9.2.24.v20180105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-http-9.2.22.v20170606.jar b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-http-9.2.24.v20180105.jar
similarity index 91%
rename from apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-http-9.2.22.v20170606.jar
rename to apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-http-9.2.24.v20180105.jar
index e7cf57840..c62ad4da4 100644
Binary files a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-http-9.2.22.v20170606.jar and b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-http-9.2.24.v20180105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-io-9.2.22.v20170606.jar b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-io-9.2.24.v20180105.jar
similarity index 88%
rename from apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-io-9.2.22.v20170606.jar
rename to apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-io-9.2.24.v20180105.jar
index 552dc747a..69918be05 100644
Binary files a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-io-9.2.22.v20170606.jar and b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-io-9.2.24.v20180105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-jmx-9.2.22.v20170606.jar b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-jmx-9.2.24.v20180105.jar
similarity index 82%
rename from apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-jmx-9.2.22.v20170606.jar
rename to apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-jmx-9.2.24.v20180105.jar
index b4708e46e..b9bed3fe0 100644
Binary files a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-jmx-9.2.22.v20170606.jar and b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-jmx-9.2.24.v20180105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-rewrite-9.2.22.v20170606.jar b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-rewrite-9.2.24.v20180105.jar
similarity index 80%
rename from apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-rewrite-9.2.22.v20170606.jar
rename to apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-rewrite-9.2.24.v20180105.jar
index 858477ace..fce6f3e52 100644
Binary files a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-rewrite-9.2.22.v20170606.jar and b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-rewrite-9.2.24.v20180105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-schemas-3.1.jar b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-schemas-3.1.jar
similarity index 100%
rename from apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-schemas-3.1.jar
rename to apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-schemas-3.1.jar
diff --git a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-security-9.2.22.v20170606.jar b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-security-9.2.24.v20180105.jar
similarity index 89%
rename from apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-security-9.2.22.v20170606.jar
rename to apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-security-9.2.24.v20180105.jar
index 7130a3f38..a6494a029 100644
Binary files a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-security-9.2.22.v20170606.jar and b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-security-9.2.24.v20180105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-server-9.2.22.v20170606.jar b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-server-9.2.24.v20180105.jar
similarity index 93%
rename from apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-server-9.2.22.v20170606.jar
rename to apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-server-9.2.24.v20180105.jar
index 531aa23bf..48ccf577c 100644
Binary files a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-server-9.2.22.v20170606.jar and b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-server-9.2.24.v20180105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-servlet-9.2.22.v20170606.jar b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-servlet-9.2.24.v20180105.jar
similarity index 92%
rename from apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-servlet-9.2.22.v20170606.jar
rename to apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-servlet-9.2.24.v20180105.jar
index 008d1bdc1..c67725b40 100644
Binary files a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-servlet-9.2.22.v20170606.jar and b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-servlet-9.2.24.v20180105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-servlets-9.2.22.v20170606.jar b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-servlets-9.2.24.v20180105.jar
similarity index 91%
rename from apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-servlets-9.2.22.v20170606.jar
rename to apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-servlets-9.2.24.v20180105.jar
index 70da6d36f..d6b057e71 100644
Binary files a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-servlets-9.2.22.v20170606.jar and b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-servlets-9.2.24.v20180105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-util-9.2.22.v20170606.jar b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-util-9.2.24.v20180105.jar
similarity index 90%
rename from apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-util-9.2.22.v20170606.jar
rename to apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-util-9.2.24.v20180105.jar
index 73619905e..15e2723df 100644
Binary files a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-util-9.2.22.v20170606.jar and b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-util-9.2.24.v20180105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-webapp-9.2.22.v20170606.jar b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-webapp-9.2.24.v20180105.jar
similarity index 92%
rename from apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-webapp-9.2.22.v20170606.jar
rename to apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-webapp-9.2.24.v20180105.jar
index 0ab79cdfd..e33cc98d3 100644
Binary files a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-webapp-9.2.22.v20170606.jar and b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-webapp-9.2.24.v20180105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-xml-9.2.22.v20170606.jar b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-xml-9.2.24.v20180105.jar
similarity index 89%
rename from apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-xml-9.2.22.v20170606.jar
rename to apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-xml-9.2.24.v20180105.jar
index 93d4c1387..3c7d309db 100644
Binary files a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/jetty-xml-9.2.22.v20170606.jar and b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-xml-9.2.24.v20180105.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.22.v20170606/lib/servlet-api-3.1.jar b/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/servlet-api-3.1.jar
similarity index 100%
rename from apps/jetty/jetty-distribution-9.2.22.v20170606/lib/servlet-api-3.1.jar
rename to apps/jetty/jetty-distribution-9.2.24.v20180105/lib/servlet-api-3.1.jar
diff --git a/apps/jetty/jetty-distribution-9.2.22.v20170606/start.jar b/apps/jetty/jetty-distribution-9.2.24.v20180105/start.jar
similarity index 92%
rename from apps/jetty/jetty-distribution-9.2.22.v20170606/start.jar
rename to apps/jetty/jetty-distribution-9.2.24.v20180105/start.jar
index 29c26d668..4afa073ab 100644
Binary files a/apps/jetty/jetty-distribution-9.2.22.v20170606/start.jar and b/apps/jetty/jetty-distribution-9.2.24.v20180105/start.jar differ
diff --git a/build.xml b/build.xml
index 0f5894b27..2c11e1bca 100644
--- a/build.xml
+++ b/build.xml
@@ -1373,7 +1373,7 @@
     </target>
 
     <target name="preplicenses-unlesspkg" depends="settomcatprop" unless="${with-libtomcat-java}" >
-        <copy file="apps/jetty/apache-tomcat-8.5.23/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
+        <copy file="apps/jetty/apache-tomcat-8.5.30/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
     </target>
 
     <!-- DOES include launch4j licenses for Windows builds -->
@@ -2362,9 +2362,9 @@
             <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
             <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
             <!-- libjetty9-java -->
-            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
+            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.24.v20180105" />
             <!-- libtomcat8-java -->
-            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
+            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" />
             <!-- libjstl1.1-java or glassfish-javaee or libtaglibs-standard -->
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
             <!-- libjakarta-taglibs-standard-java or glassfish-javaee or libtaglibs-standard -->
@@ -2439,8 +2439,8 @@
             <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
             <!-- libjetty9-java -->
           <!--
-            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
-            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
+            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.24.v20180105" />
+            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" />
            -->
             <!-- libjstl1.1-java or glassfish-javaee -->
           <!--
@@ -2518,8 +2518,8 @@
            -->
             <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
             <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
-            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
-            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
+            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.24.v20180105" />
+            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" />
           <!--
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
            -->
@@ -2588,8 +2588,8 @@
            -->
             <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
             <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
-            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
-            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
+            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.24.v20180105" />
+            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" />
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
             <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
             <!-- anything added above, add in debian-tarball also -->
diff --git a/history.txt b/history.txt
index 20605454c..200717cd6 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,7 @@
+2018-04-11 zzz
+ * Jetty 9.2.24-v201801015
+ * Tomcat 8.5.30
+
 * 2018-04-10 0.9.34 released
 
 2018-04-10 zzz
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index a411b0099..87e5bffca 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 = 0;
+    public final static long BUILD = 1;
 
     /** for example "-test" */
     public final static String EXTRA = "";