diff --git a/LICENSE.txt b/LICENSE.txt
index 0441e69ad..04a80ad25 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -297,7 +297,7 @@ Applications:
    Systray (systray.jar):
    Public domain.
 
-   Tomcat 8.5.30 (jasper-runtime.jar):
+   Tomcat 8.5.34 (jasper-runtime.jar):
    (not included in most distribution packages)
    Copyright 1999-2018 The Apache Software Foundation
    See licenses/LICENSE-Apache2.0.txt
diff --git a/apps/jetty/apache-tomcat-8.5.30/NOTICE b/apps/jetty/apache-tomcat-8.5.34/NOTICE
similarity index 91%
rename from apps/jetty/apache-tomcat-8.5.30/NOTICE
rename to apps/jetty/apache-tomcat-8.5.34/NOTICE
index eca541e97..d99a4bfc0 100644
--- a/apps/jetty/apache-tomcat-8.5.30/NOTICE
+++ b/apps/jetty/apache-tomcat-8.5.34/NOTICE
@@ -2,11 +2,11 @@ Apache Tomcat
 Copyright 1999-2018 The Apache Software Foundation
 
 This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+The Apache Software Foundation (https://www.apache.org/).
 
 This software contains code derived from netty-native
 developed by the Netty project
-(http://netty.io, https://github.com/netty/netty-tcnative/)
+(https://netty.io, https://github.com/netty/netty-tcnative/)
 and from finagle-native developed at Twitter
 (https://github.com/twitter/finagle).
 
@@ -19,7 +19,7 @@ http://nsis.sourceforge.net.
 Java compilation software for JSP pages is provided by the Eclipse
 JDT Core Batch Compiler component, which is open source software.
 The original software and related information is available at
-http://www.eclipse.org/jdt/core/.
+https://www.eclipse.org/jdt/core/.
 
 For portions of the Tomcat JNI OpenSSL API and the OpenSSL JSSE integration
 The org.apache.tomcat.jni and the org.apache.tomcat.net.openssl packages
diff --git a/apps/jetty/apache-tomcat-8.5.30/bin/tomcat-juli.jar b/apps/jetty/apache-tomcat-8.5.34/bin/tomcat-juli.jar
similarity index 90%
rename from apps/jetty/apache-tomcat-8.5.30/bin/tomcat-juli.jar
rename to apps/jetty/apache-tomcat-8.5.34/bin/tomcat-juli.jar
index 527bfbf56..d04d917e7 100644
Binary files a/apps/jetty/apache-tomcat-8.5.30/bin/tomcat-juli.jar and b/apps/jetty/apache-tomcat-8.5.34/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.34/lib/el-api.jar
similarity index 57%
rename from apps/jetty/apache-tomcat-8.5.30/lib/el-api.jar
rename to apps/jetty/apache-tomcat-8.5.34/lib/el-api.jar
index 1b1b3fe9f..cf1a45ec1 100644
Binary files a/apps/jetty/apache-tomcat-8.5.30/lib/el-api.jar and b/apps/jetty/apache-tomcat-8.5.34/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.34/lib/jasper-el.jar
similarity index 80%
rename from apps/jetty/apache-tomcat-8.5.30/lib/jasper-el.jar
rename to apps/jetty/apache-tomcat-8.5.34/lib/jasper-el.jar
index bd36bc815..6f9fb958c 100644
Binary files a/apps/jetty/apache-tomcat-8.5.30/lib/jasper-el.jar and b/apps/jetty/apache-tomcat-8.5.34/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.34/lib/jasper.jar
similarity index 51%
rename from apps/jetty/apache-tomcat-8.5.30/lib/jasper.jar
rename to apps/jetty/apache-tomcat-8.5.34/lib/jasper.jar
index 616da002c..0eefc1f29 100644
Binary files a/apps/jetty/apache-tomcat-8.5.30/lib/jasper.jar and b/apps/jetty/apache-tomcat-8.5.34/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.34/lib/jsp-api.jar
similarity index 85%
rename from apps/jetty/apache-tomcat-8.5.30/lib/jsp-api.jar
rename to apps/jetty/apache-tomcat-8.5.34/lib/jsp-api.jar
index 24d3aa571..c4ac4c524 100644
Binary files a/apps/jetty/apache-tomcat-8.5.30/lib/jsp-api.jar and b/apps/jetty/apache-tomcat-8.5.34/lib/jsp-api.jar differ
diff --git a/apps/jetty/apache-tomcat-8.5.30/lib/tomcat-api.jar b/apps/jetty/apache-tomcat-8.5.34/lib/tomcat-api.jar
similarity index 78%
rename from apps/jetty/apache-tomcat-8.5.30/lib/tomcat-api.jar
rename to apps/jetty/apache-tomcat-8.5.34/lib/tomcat-api.jar
index 92dcd54b3..e4f98a1bb 100644
Binary files a/apps/jetty/apache-tomcat-8.5.30/lib/tomcat-api.jar and b/apps/jetty/apache-tomcat-8.5.34/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.34/lib/tomcat-util-scan.jar
similarity index 61%
rename from apps/jetty/apache-tomcat-8.5.30/lib/tomcat-util-scan.jar
rename to apps/jetty/apache-tomcat-8.5.34/lib/tomcat-util-scan.jar
index 2d9a44fae..900995358 100644
Binary files a/apps/jetty/apache-tomcat-8.5.30/lib/tomcat-util-scan.jar and b/apps/jetty/apache-tomcat-8.5.34/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.34/lib/tomcat-util.jar
similarity index 79%
rename from apps/jetty/apache-tomcat-8.5.30/lib/tomcat-util.jar
rename to apps/jetty/apache-tomcat-8.5.34/lib/tomcat-util.jar
index e6ddc0937..8d643e41a 100644
Binary files a/apps/jetty/apache-tomcat-8.5.30/lib/tomcat-util.jar and b/apps/jetty/apache-tomcat-8.5.34/lib/tomcat-util.jar differ
diff --git a/build.xml b/build.xml
index d2a0689cb..a35d5e02e 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.30" />
+    <property name="tomcat.ver" value="8.5.34" />
 
     <!-- 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 f358939f4..e9c588461 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,10 @@
+2018-09-16 zzz
+ * Build: Fix hang with Tomcat 8.5.33+ (ticket #2307)
+ * Tomcat 8.5.34
+
+2018-08-27 zzz
+ * Debian: Prevent dup version (ticket #2300)
+
 2018-08-26 zzz
  * NTCP2: Publish outbound address after transition to firewalled
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 0725033fa..f6e6df3a5 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 = 3;
+    public final static long BUILD = 4;
 
     /** for example "-test" */
     public final static String EXTRA = "";