diff --git a/LICENSE.txt b/LICENSE.txt
index 23509334c..11dd51e38 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -182,7 +182,7 @@ Applications:
    By welterde.
    See licenses/LICENSE-GPLv2.txt
 
-   Jetty 8.1.14.v20131031:
+   Jetty 8.1.15.v20140411:
    See licenses/ABOUT-Jetty.html
    See licenses/NOTICE-Jetty.html
    See licenses/LICENSE-Apache2.0.txt
@@ -248,8 +248,8 @@ Applications:
       Bundles systray4j-2.4.1:
       See licenses/LICENSE-LGPLv2.1.txt
 
-   Tomcat 6.0.37:
-   Copyright 1999-2013 The Apache Software Foundation
+   Tomcat 6.0.41:
+   Copyright 1999-2014 The Apache Software Foundation
    See licenses/LICENSE-Apache2.0.txt
    See licenses/NOTICE-Tomcat.txt
 
diff --git a/apps/jetty/apache-tomcat-deployer/NOTICE b/apps/jetty/apache-tomcat-deployer/NOTICE
index 908b08c4f..932b4e744 100644
--- a/apps/jetty/apache-tomcat-deployer/NOTICE
+++ b/apps/jetty/apache-tomcat-deployer/NOTICE
@@ -1,7 +1,7 @@
 Apache Tomcat
-Copyright 1999-2013 The Apache Software Foundation
+Copyright 1999-2014 The Apache Software Foundation
 
-This product includes software developed by
+This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
 The Windows Installer is built with the Nullsoft
@@ -14,3 +14,9 @@ Java compilation software for JSP pages is provided by Eclipse,
 which is open source software.  The original software and 
 related information is available at
 http://www.eclipse.org.
+
+The original XML Schemas for Java EE Deployment Descriptors:
+ - javaee_5.xsd
+ - javaee_web_services_1_2.xsd
+ - javaee_web_services_client_1_2.xsd
+may be obtained from http://java.sun.com/xml/ns/javaee/
diff --git a/apps/jetty/apache-tomcat-deployer/README-i2p.txt b/apps/jetty/apache-tomcat-deployer/README-i2p.txt
index 1f86ca34d..fdf2a3114 100644
--- a/apps/jetty/apache-tomcat-deployer/README-i2p.txt
+++ b/apps/jetty/apache-tomcat-deployer/README-i2p.txt
@@ -2,7 +2,7 @@ This is Apache Tomcat 6.x, supporting Servlet 2.5 and JSP 2.1.
 The Glassfish JSP 2.1 bundled in Jetty 6 is way too old.
 
 Retrieved from the file
-	apache-tomcat-6.0.37-deployer.tar.gz
+	apache-tomcat-6.0.41-deployer.tar.gz
 
 minus the following files and directores:
 
diff --git a/apps/jetty/apache-tomcat-deployer/lib/el-api.jar b/apps/jetty/apache-tomcat-deployer/lib/el-api.jar
index 2cd4602ed..32818aef3 100644
Binary files a/apps/jetty/apache-tomcat-deployer/lib/el-api.jar and b/apps/jetty/apache-tomcat-deployer/lib/el-api.jar differ
diff --git a/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar b/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar
index 7a1afca20..e3bc712ba 100644
Binary files a/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar and b/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar differ
diff --git a/apps/jetty/apache-tomcat-deployer/lib/jasper.jar b/apps/jetty/apache-tomcat-deployer/lib/jasper.jar
index 81db34669..bc595102e 100644
Binary files a/apps/jetty/apache-tomcat-deployer/lib/jasper.jar and b/apps/jetty/apache-tomcat-deployer/lib/jasper.jar differ
diff --git a/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar b/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar
index 9d1273ee6..ff13de88e 100644
Binary files a/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar and b/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar differ
diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index 78790938d..ddb0fffbc 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." default="all" name="jetty">
 
-    <property name="jetty.ver" value="8.1.14.v20131031" />
+    <property name="jetty.ver" value="8.1.15.v20140411" />
     <property name="jetty.base" value="jetty-distribution-${jetty.ver}" />
-    <property name="jetty.sha1" value="a6690261a822157c82fcc6327d05ac8c7dfed0a3" />
+    <property name="jetty.sha1" value="41ec2b5e5605c038fb28d1f118669f06b4479e71" />
     <property name="jetty.filename" value="${jetty.base}.zip" />
     <property name="jetty.url" value="http://download.eclipse.org/jetty/${jetty.ver}/dist/${jetty.filename}" />
     <property name="verified.filename" value="verified.txt" />
diff --git a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-jmx-8.1.14.v20131031.jar b/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-jmx-8.1.14.v20131031.jar
deleted file mode 100644
index 0603a2d5c..000000000
Binary files a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-jmx-8.1.14.v20131031.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.14.v20131031/start.jar b/apps/jetty/jetty-distribution-8.1.14.v20131031/start.jar
deleted file mode 100644
index cd556b441..000000000
Binary files a/apps/jetty/jetty-distribution-8.1.14.v20131031/start.jar and /dev/null differ
diff --git a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-continuation-8.1.14.v20131031.jar b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-continuation-8.1.15.v20140411.jar
similarity index 79%
rename from apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-continuation-8.1.14.v20131031.jar
rename to apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-continuation-8.1.15.v20140411.jar
index 43c75169f..5dceaf49c 100644
Binary files a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-continuation-8.1.14.v20131031.jar and b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-continuation-8.1.15.v20140411.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-deploy-8.1.14.v20131031.jar b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-deploy-8.1.15.v20140411.jar
similarity index 71%
rename from apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-deploy-8.1.14.v20131031.jar
rename to apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-deploy-8.1.15.v20140411.jar
index 9cb836b17..d83efa193 100644
Binary files a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-deploy-8.1.14.v20131031.jar and b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-deploy-8.1.15.v20140411.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-http-8.1.14.v20131031.jar b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-http-8.1.15.v20140411.jar
similarity index 59%
rename from apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-http-8.1.14.v20131031.jar
rename to apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-http-8.1.15.v20140411.jar
index 94f7c7c38..330344363 100644
Binary files a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-http-8.1.14.v20131031.jar and b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-http-8.1.15.v20140411.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-io-8.1.14.v20131031.jar b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-io-8.1.15.v20140411.jar
similarity index 59%
rename from apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-io-8.1.14.v20131031.jar
rename to apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-io-8.1.15.v20140411.jar
index 75708326b..f2554fa39 100644
Binary files a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-io-8.1.14.v20131031.jar and b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-io-8.1.15.v20140411.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-jmx-8.1.15.v20140411.jar b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-jmx-8.1.15.v20140411.jar
new file mode 100644
index 000000000..a00233fbf
Binary files /dev/null and b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-jmx-8.1.15.v20140411.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-rewrite-8.1.14.v20131031.jar b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-rewrite-8.1.15.v20140411.jar
similarity index 53%
rename from apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-rewrite-8.1.14.v20131031.jar
rename to apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-rewrite-8.1.15.v20140411.jar
index c415d8e05..5004187da 100644
Binary files a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-rewrite-8.1.14.v20131031.jar and b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-rewrite-8.1.15.v20140411.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-security-8.1.14.v20131031.jar b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-security-8.1.15.v20140411.jar
similarity index 66%
rename from apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-security-8.1.14.v20131031.jar
rename to apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-security-8.1.15.v20140411.jar
index b03e81283..bafcf7293 100644
Binary files a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-security-8.1.14.v20131031.jar and b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-security-8.1.15.v20140411.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-server-8.1.14.v20131031.jar b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-server-8.1.15.v20140411.jar
similarity index 57%
rename from apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-server-8.1.14.v20131031.jar
rename to apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-server-8.1.15.v20140411.jar
index d03aba100..ded9cf489 100644
Binary files a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-server-8.1.14.v20131031.jar and b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-server-8.1.15.v20140411.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-servlet-8.1.14.v20131031.jar b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-servlet-8.1.15.v20140411.jar
similarity index 50%
rename from apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-servlet-8.1.14.v20131031.jar
rename to apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-servlet-8.1.15.v20140411.jar
index 1210e620d..556dc68fe 100644
Binary files a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-servlet-8.1.14.v20131031.jar and b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-servlet-8.1.15.v20140411.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-servlets-8.1.14.v20131031.jar b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-servlets-8.1.15.v20140411.jar
similarity index 72%
rename from apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-servlets-8.1.14.v20131031.jar
rename to apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-servlets-8.1.15.v20140411.jar
index 0ab9e0abe..d30991166 100644
Binary files a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-servlets-8.1.14.v20131031.jar and b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-servlets-8.1.15.v20140411.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-util-8.1.14.v20131031.jar b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-util-8.1.15.v20140411.jar
similarity index 69%
rename from apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-util-8.1.14.v20131031.jar
rename to apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-util-8.1.15.v20140411.jar
index 6fc403191..170d66fc2 100644
Binary files a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-util-8.1.14.v20131031.jar and b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-util-8.1.15.v20140411.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-webapp-8.1.14.v20131031.jar b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-webapp-8.1.15.v20140411.jar
similarity index 63%
rename from apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-webapp-8.1.14.v20131031.jar
rename to apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-webapp-8.1.15.v20140411.jar
index fc314cc75..17ebd18e7 100644
Binary files a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-webapp-8.1.14.v20131031.jar and b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-webapp-8.1.15.v20140411.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-xml-8.1.14.v20131031.jar b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-xml-8.1.15.v20140411.jar
similarity index 63%
rename from apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-xml-8.1.14.v20131031.jar
rename to apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-xml-8.1.15.v20140411.jar
index faf6ad4ab..5f922235d 100644
Binary files a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jetty-xml-8.1.14.v20131031.jar and b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jetty-xml-8.1.15.v20140411.jar differ
diff --git a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar
similarity index 100%
rename from apps/jetty/jetty-distribution-8.1.14.v20131031/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar
rename to apps/jetty/jetty-distribution-8.1.15.v20140411/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar
diff --git a/apps/jetty/jetty-distribution-8.1.14.v20131031/lib/servlet-api-3.0.jar b/apps/jetty/jetty-distribution-8.1.15.v20140411/lib/servlet-api-3.0.jar
similarity index 100%
rename from apps/jetty/jetty-distribution-8.1.14.v20131031/lib/servlet-api-3.0.jar
rename to apps/jetty/jetty-distribution-8.1.15.v20140411/lib/servlet-api-3.0.jar
diff --git a/apps/jetty/jetty-distribution-8.1.15.v20140411/start.jar b/apps/jetty/jetty-distribution-8.1.15.v20140411/start.jar
new file mode 100644
index 000000000..9c1615291
Binary files /dev/null and b/apps/jetty/jetty-distribution-8.1.15.v20140411/start.jar differ
diff --git a/history.txt b/history.txt
index 5b6dbb5a4..d3f6cbbc7 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,11 @@
+2014-06-09 zzz
+ * i2psnark:
+   - Show client version if available
+   - Linkify all announce URLs on details page
+   - Sanitize announce URLs
+ * Jetty 8.1.15.v20140411
+ * Tomcat 6.0.41
+
 2014-06-07 zzz
  * Console: Fix NPE in summary bar
  * Eepsite: Updated French help page (thx hummingbird)
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 = "";