diff --git a/core/java/build.xml b/core/java/build.xml
index 2b02912f3..39a74332a 100644
--- a/core/java/build.xml
+++ b/core/java/build.xml
@@ -361,8 +361,12 @@
         <!-- warning - The junit.test target below doesn't actually include i2ptest.jar in the classpath,
              only the build/obj directory.
           -->
+        <mkdir dir="build/obj/net/i2p/util/resources" />
+        <copy todir="build/obj/net/i2p/util/resources" >
+            <fileset dir="../resources" />
+        </copy>
         <jar destfile="./build/i2ptest.jar" basedir="./build/obj" >
-            <fileset dir="./build/obj" includes="**/*.class **/test.data **/baseDblPrecmp **/basePrecmp" />
+            <fileset dir="test/resources" includes="**/test.data **/baseDblPrecmp **/basePrecmp" />
             <!-- the getopt translation files -->
             <fileset dir="src" includes="${translation.includes}" />
             <manifest>
diff --git a/history.txt b/history.txt
index bae0c0283..ada9c3a82 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,22 @@
+2021-06-22 zzz
+ * Tests: Fix duplicate classes in i2ptest.jar
+ * Tunnels: Changes for new build messages (Prop. 157)
+
+2021-06-20 zzz
+ * Jetty: Case-insensitive sort on directory listing, put directories first
+
+2021-06-18 zzz
+ * Console: Add Permissions-Policy header
+ * SSU: Fix handling of bad peer test responses
+ * Transport: Remove 4/6 caps config
+
+2021-06-16 zzz
+ * Router: Increase key pool sizes for slow machines
+
+2021-06-13 zzz
+ * Tests: Fix and expand BuildMessageTestStandalone
+ * Tunnels: Continue work on new build messages (proposal 157)
+
 2021-06-11 zzz
  * UPnP: Bind to IPv6 addresses for search responses
 
diff --git a/router/java/build.xml b/router/java/build.xml
index 22133cb46..3a4db03b6 100644
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -316,9 +316,13 @@
     </target>
 
     <target name="jarTest" depends="junit.compileTest">
-        <jar destfile="./build/routertest.jar" basedir="./build/obj" includes="**/*.class">
+        <mkdir dir="build/obj/net/i2p/router/util/resources" />
+        <copy todir="build/obj/net/i2p/router/util/resources" >
+            <fileset dir="../resources" />
+        </copy>
+        <jar destfile="./build/routertest.jar" basedir="./build/obj">
             <manifest>
-                <attribute name="${manifest.classpath.name}" value="i2p.jar" />
+                <attribute name="${manifest.classpath.name}" value="i2ptest.jar" />
                 <attribute name="Specification-Title" value="I2P Router" />
                 <attribute name="Specification-Version" value="${api.version}" />
                 <attribute name="Specification-Vendor" value="The I2P Project https://geti2p.net/" />
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 2d30a2c12..35ab2b80b 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 = "Git";
     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 = "";