diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml
index fa3e5d677..9647fa8d1 100644
--- a/apps/i2ptunnel/java/build.xml
+++ b/apps/i2ptunnel/java/build.xml
@@ -41,10 +41,8 @@
                 <attribute name="Class-Path" value="i2p.jar mstreaming.jar" />
             </manifest>
         </jar>
-        <ant target="war" />
         <ant target="bundle" />
-        <!-- jar again to get the latest messages_*.class files -->
-        <jar destfile="./build/i2ptunnel.jar" basedir="./build/obj" includes="**/*.class" update="true" />
+        <ant target="war" />
     </target>
 
     <target name="bundle" depends="compile, precompilejsp">
diff --git a/apps/i2ptunnel/java/bundle-messages.sh b/apps/i2ptunnel/java/bundle-messages.sh
index aa98a3167..a7e44226b 100755
--- a/apps/i2ptunnel/java/bundle-messages.sh
+++ b/apps/i2ptunnel/java/bundle-messages.sh
@@ -76,7 +76,7 @@ do
 	echo "Generating ${CLASS}_$LG ResourceBundle..."
 
 	# convert to class files in build/obj
-	msgfmt --java -r $CLASS -l $LG -d build/obj $i
+	msgfmt --java --statistics -r $CLASS -l $LG -d ../jsp/WEB-INF/classes $i
 	if [ $? -ne 0 ]
 	then
 		echo 'Warning - msgfmt failed, not updating translations'
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/Messages.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/Messages.java
index fa3839232..591d6a98c 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/Messages.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/Messages.java
@@ -7,7 +7,7 @@ import net.i2p.util.Translate;
  * Translate strings for this package.
  */
 public class Messages {
-    private static final String BUNDLE_NAME = "net.i2p.i2ptunnel.messages";
+    private static final String BUNDLE_NAME = "net.i2p.i2ptunnel.web.messages";
     private final I2PAppContext _context;
 
     public Messages() {
diff --git a/history.txt b/history.txt
index 9d16e53d3..edb571f71 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,11 @@
+2009-12-15 zzz
+    * HTTP Proxy: Make jump server list configurable
+    * i2psnark: Fix stop/start, cleanups
+    * i2ptunnel: Fix bundle location
+    * susidns: UTF-8 fixes
+    * TunnelManager: Fix a locking bug
+    * Update: Improve error message
+
 2009-12-13 zzz
     * Find ResourceBundles in wars
     * Fix restart from config.jsp if no wrapper
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 5a4225cae..aea509c4d 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 = 6;
+    public final static long BUILD = 7;
     /** for example "-test" */
     public final static String EXTRA = "";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;