diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index accb730a80..7e2628a670 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -364,7 +364,7 @@
             srcdir="./java/src" 
             destdir="./build/obj" >
             <classpath>
-                <pathelement location="../../../core/java/build/i2p.jar" />
+                <pathelement location="../../core/java/build/i2p.jar" />
                 <pathelement location="./jettylib/org.mortbay.jetty.jar" />
                 <pathelement location="./jettylib/jasper-runtime.jar" />
                 <pathelement location="./jettylib/javax.servlet.jar" />
@@ -387,8 +387,23 @@
             srcdir="./java/src" 
             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
             destdir="./build/obj" 
-            includeAntRuntime="false"
-            classpath="../../core/java/build/i2p.jar:./jettylib/javax.servlet.jar:./jettylib/org.mortbay.jetty.jar:./jettylib/jetty-http.jar:./jettylib/jetty-io.jar:./jettylib/jetty-security.jar:./jettylib/jetty-servlet.jar:./jettylib/jetty-util.jar:./jettylib/jetty-xml.jar:./jettylib/jetty-deploy.jar:./jettylib/jasper-runtime.jar:./jettylib/jetty-webapp.jar" >
+            includeAntRuntime="false" >
+            <classpath>
+                <pathelement location="../../core/java/build/i2p.jar" />
+                <pathelement location="./jettylib/jasper-runtime.jar" />
+                <pathelement location="./jettylib/javax.servlet.jar" />
+                <pathelement location="./jettylib/jetty-deploy.jar" />
+                <pathelement location="./jettylib/jetty-http.jar" />
+                <pathelement location="./jettylib/jetty-io.jar" />
+                <pathelement location="./jettylib/jetty-security.jar" />
+                <pathelement location="./jettylib/jetty-servlet.jar" />
+                <pathelement location="./jettylib/jetty-util.jar" />
+                <pathelement location="./jettylib/jetty-webapp.jar" />
+                <pathelement location="./jettylib/jetty-xml.jar" />
+                <pathelement location="./jettylib/org.mortbay.jetty.jar" />
+                <!-- following jar only present for debian builds -->
+                <pathelement location="./jettylib/tomcat-api.jar" />
+            </classpath>
             <compilerarg line="${javac.compilerargs}" />
         </javac>
     </target>
@@ -566,6 +581,7 @@
                 <pathelement location="../../core/java/build/libintl.jar" />
                 <pathelement location="../../core/java/build/gnu-getopt.jar" />
                 <pathelement location="../../core/java/build/json-simple.jar" />
+                <pathelement location="./jettylib/tomcat-api.jar" />
             </classpath>
             <!-- These variables are stored in build.properties.
                   End-users can override by creating the file override.properties -->
diff --git a/history.txt b/history.txt
index ce80f6af9d..f40d6948f7 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,17 @@
+2019-06-02 zzz
+ * Build: Fix Debian (ticket #2517)
+
+2019-06-01 zzz
+ * NetDB: Don't wait for all RIs to be read in on Android
+ * Tunnels: Ensure GW Pumper threads stop on Android
+
+2019-05-31 zzz
+ * Blinding: Bug fixes
+ * Transport: UPnP fixes for Android (ticket #2499)
+
+2019-05-30 zzz
+ * Console: Support deleting blinded entries on /configkeyring
+
 2019-05-29 zzz
  * I2CP: Fix bugs with lookup password
  * Util: Store save time in config files
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index fecba78d69..a6204817e3 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 = 7;
+    public final static long BUILD = 8;
 
     /** for example "-test" */
     public final static String EXTRA = "";