diff --git a/LICENSE.txt b/LICENSE.txt
index 3bd3a2602..0441e69ad 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -233,7 +233,7 @@ Applications:
      Zxing 3.3.0:
        See licenses/LICENSE-Apache2.0.txt
 
-   Jetty 9.2.24.v20180105 (jetty-*.jar, org.mortbay.*.jar):
+   Jetty 9.2.25.v20180606 (jetty-*.jar, org.mortbay.*.jar):
    (not included in most distribution packages, except for jetty-i2p.jar)
    See licenses/ABOUT-Jetty.html
    See licenses/NOTICE-Jetty.html
diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index be33c27b6..a09f56d52 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -18,7 +18,7 @@
     <!-- jetty.branch unused until we go to 9.3 -->
     <property name="jetty.branch" value="stable-9" />
     <property name="jetty.base" value="jetty-distribution-${jetty.ver}" />
-    <property name="jetty.sha1" value="a8af3941385d43eece329b09ae4a261e0cb3579c" />
+    <property name="jetty.sha1" value="086212b8536faa9a584777ebd59618fa4d7176a0" />
     <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}" />
diff --git a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.2.24.v20180105.jar b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.2.25.v20180606.jar
similarity index 57%
rename from apps/jetty/jetty-distribution-9.2.24.v20180105/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.2.24.v20180105.jar
rename to apps/jetty/jetty-distribution-9.2.25.v20180606/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.2.25.v20180606.jar
index 38049888c..90105b0bb 100644
Binary files a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.2.24.v20180105.jar and b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.2.25.v20180606.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-continuation-9.2.24.v20180105.jar b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-continuation-9.2.25.v20180606.jar
similarity index 76%
rename from apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-continuation-9.2.24.v20180105.jar
rename to apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-continuation-9.2.25.v20180606.jar
index 52cf11afc..da7d4cd9a 100644
Binary files a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-continuation-9.2.24.v20180105.jar and b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-continuation-9.2.25.v20180606.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-deploy-9.2.24.v20180105.jar b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-deploy-9.2.25.v20180606.jar
similarity index 85%
rename from apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-deploy-9.2.24.v20180105.jar
rename to apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-deploy-9.2.25.v20180606.jar
index fe9c116b9..a1b1a41b0 100644
Binary files a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-deploy-9.2.24.v20180105.jar and b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-deploy-9.2.25.v20180606.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-http-9.2.24.v20180105.jar b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-http-9.2.25.v20180606.jar
similarity index 77%
rename from apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-http-9.2.24.v20180105.jar
rename to apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-http-9.2.25.v20180606.jar
index c62ad4da4..b6edfe616 100644
Binary files a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-http-9.2.24.v20180105.jar and b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-http-9.2.25.v20180606.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-io-9.2.24.v20180105.jar b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-io-9.2.25.v20180606.jar
similarity index 75%
rename from apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-io-9.2.24.v20180105.jar
rename to apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-io-9.2.25.v20180606.jar
index 69918be05..2c4fcd237 100644
Binary files a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-io-9.2.24.v20180105.jar and b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-io-9.2.25.v20180606.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-jmx-9.2.24.v20180105.jar b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-jmx-9.2.25.v20180606.jar
similarity index 83%
rename from apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-jmx-9.2.24.v20180105.jar
rename to apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-jmx-9.2.25.v20180606.jar
index b9bed3fe0..d10e4f595 100644
Binary files a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-jmx-9.2.24.v20180105.jar and b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-jmx-9.2.25.v20180606.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-rewrite-9.2.24.v20180105.jar b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-rewrite-9.2.25.v20180606.jar
similarity index 81%
rename from apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-rewrite-9.2.24.v20180105.jar
rename to apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-rewrite-9.2.25.v20180606.jar
index fce6f3e52..ed3c972d4 100644
Binary files a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-rewrite-9.2.24.v20180105.jar and b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-rewrite-9.2.25.v20180606.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-schemas-3.1.jar b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-schemas-3.1.jar
similarity index 100%
rename from apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-schemas-3.1.jar
rename to apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-schemas-3.1.jar
diff --git a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-security-9.2.24.v20180105.jar b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-security-9.2.25.v20180606.jar
similarity index 89%
rename from apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-security-9.2.24.v20180105.jar
rename to apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-security-9.2.25.v20180606.jar
index a6494a029..1f8badebb 100644
Binary files a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-security-9.2.24.v20180105.jar and b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-security-9.2.25.v20180606.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-server-9.2.24.v20180105.jar b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-server-9.2.25.v20180606.jar
similarity index 89%
rename from apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-server-9.2.24.v20180105.jar
rename to apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-server-9.2.25.v20180606.jar
index 48ccf577c..646c52eb4 100644
Binary files a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-server-9.2.24.v20180105.jar and b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-server-9.2.25.v20180606.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-servlet-9.2.24.v20180105.jar b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-servlet-9.2.25.v20180606.jar
similarity index 92%
rename from apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-servlet-9.2.24.v20180105.jar
rename to apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-servlet-9.2.25.v20180606.jar
index c67725b40..222f6a3e1 100644
Binary files a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-servlet-9.2.24.v20180105.jar and b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-servlet-9.2.25.v20180606.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-servlets-9.2.24.v20180105.jar b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-servlets-9.2.25.v20180606.jar
similarity index 91%
rename from apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-servlets-9.2.24.v20180105.jar
rename to apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-servlets-9.2.25.v20180606.jar
index d6b057e71..4a78e5496 100644
Binary files a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-servlets-9.2.24.v20180105.jar and b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-servlets-9.2.25.v20180606.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-util-9.2.24.v20180105.jar b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-util-9.2.25.v20180606.jar
similarity index 91%
rename from apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-util-9.2.24.v20180105.jar
rename to apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-util-9.2.25.v20180606.jar
index 15e2723df..78796555d 100644
Binary files a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-util-9.2.24.v20180105.jar and b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-util-9.2.25.v20180606.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-webapp-9.2.24.v20180105.jar b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-webapp-9.2.25.v20180606.jar
similarity index 92%
rename from apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-webapp-9.2.24.v20180105.jar
rename to apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-webapp-9.2.25.v20180606.jar
index e33cc98d3..c3ae4a9ed 100644
Binary files a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-webapp-9.2.24.v20180105.jar and b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-webapp-9.2.25.v20180606.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-xml-9.2.24.v20180105.jar b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-xml-9.2.25.v20180606.jar
similarity index 89%
rename from apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-xml-9.2.24.v20180105.jar
rename to apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-xml-9.2.25.v20180606.jar
index 3c7d309db..1ef16fede 100644
Binary files a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/jetty-xml-9.2.24.v20180105.jar and b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/jetty-xml-9.2.25.v20180606.jar differ
diff --git a/apps/jetty/jetty-distribution-9.2.24.v20180105/lib/servlet-api-3.1.jar b/apps/jetty/jetty-distribution-9.2.25.v20180606/lib/servlet-api-3.1.jar
similarity index 100%
rename from apps/jetty/jetty-distribution-9.2.24.v20180105/lib/servlet-api-3.1.jar
rename to apps/jetty/jetty-distribution-9.2.25.v20180606/lib/servlet-api-3.1.jar
diff --git a/apps/jetty/jetty-distribution-9.2.24.v20180105/start.jar b/apps/jetty/jetty-distribution-9.2.25.v20180606/start.jar
similarity index 92%
rename from apps/jetty/jetty-distribution-9.2.24.v20180105/start.jar
rename to apps/jetty/jetty-distribution-9.2.25.v20180606/start.jar
index 4afa073ab..d99baea58 100644
Binary files a/apps/jetty/jetty-distribution-9.2.24.v20180105/start.jar and b/apps/jetty/jetty-distribution-9.2.25.v20180606/start.jar differ
diff --git a/build.xml b/build.xml
index 9480d4112..9df87246b 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,7 @@
     <property file="override.properties"/>
     <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.24.v20180105" />
+    <property name="jetty.ver" value="9.2.25.v20180606" />
     <property name="tomcat.ver" value="8.5.30" />
 
     <!-- You probably don't want to change anything from here down -->
diff --git a/history.txt b/history.txt
index 2cf427d99..20f82a914 100644
--- a/history.txt
+++ b/history.txt
@@ -1,5 +1,9 @@
+2018-08-20 zzz
+ * Jetty 9.2.25.v20180606
+
 2018-08-19 zzz
  * NTCP2: Catch bad IV exception
+ * Update translations
 
 2018-08-16 zzz
  * i2ptunnel: Change read timeout defaults now that streaming timeout works
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 0e04b1445..33006bcb1 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 = 26;
+    public final static long BUILD = 27;
 
     /** for example "-test" */
     public final static String EXTRA = "-rc";