diff --git a/apps/desktopgui/bundle-messages.sh b/apps/desktopgui/bundle-messages.sh
index 4981beadec5d3ff91ca3f7fbe62cbed9bfd0dfd4..6a3caa7d44466f7c9a6f34fb8560137960f9802c 100644
--- a/apps/desktopgui/bundle-messages.sh
+++ b/apps/desktopgui/bundle-messages.sh
@@ -110,7 +110,7 @@ do
         then
             # slow way
             # convert to class files in build
-            msgfmt --java --statistics -r $CLASS -l $LG -d build $i
+            msgfmt --java2 --statistics -r $CLASS -l $LG -d build $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -128,7 +128,7 @@ do
             TDY=$TD2/net/i2p/desktopgui
             rm -rf $TD
             mkdir -p $TD $TDY
-            msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+            msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
diff --git a/apps/i2psnark/java/bundle-messages.sh b/apps/i2psnark/java/bundle-messages.sh
index fb269d8248d2e915676993e0303081d4f2f05c90..bcb4268cf8f5d7b82d340101a001ed24f33dca66 100755
--- a/apps/i2psnark/java/bundle-messages.sh
+++ b/apps/i2psnark/java/bundle-messages.sh
@@ -101,7 +101,7 @@ do
         then
             # slow way
             # convert to class files in build/obj
-            msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $i
+            msgfmt --java2 --statistics -r $CLASS -l $LG -d build/obj $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -119,7 +119,7 @@ do
             TDY=$TD2/org/klomp/snark/web
             rm -rf $TD
             mkdir -p $TD $TDY
-            msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+            msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
diff --git a/apps/i2ptunnel/java/bundle-messages-proxy.sh b/apps/i2ptunnel/java/bundle-messages-proxy.sh
index 43f3c613e0bf44b2e86505097242397187508838..e3fe5bb229a9b5df29d9502e1782f74740fc2193 100755
--- a/apps/i2ptunnel/java/bundle-messages-proxy.sh
+++ b/apps/i2ptunnel/java/bundle-messages-proxy.sh
@@ -103,7 +103,7 @@ do
         then
             # slow way
             # convert to class files in build/obj
-            msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $i
+            msgfmt --java2 --statistics -r $CLASS -l $LG -d build/obj $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -121,7 +121,7 @@ do
             TDY=$TD2/net/i2p/i2ptunnel/proxy
             rm -rf $TD
             mkdir -p $TD $TDY
-            msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+            msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
diff --git a/apps/i2ptunnel/java/bundle-messages.sh b/apps/i2ptunnel/java/bundle-messages.sh
index c0ef7010ef83427904564141510383c45b4e5b96..5840f620e98208d64616fd8cf6b1f0af2daf565e 100755
--- a/apps/i2ptunnel/java/bundle-messages.sh
+++ b/apps/i2ptunnel/java/bundle-messages.sh
@@ -102,7 +102,7 @@ do
         then
             # slow way
             # convert to class files in jsp/WEB-INF/classes
-            msgfmt --java --statistics -r $CLASS -l $LG -d ../jsp/WEB-INF/classes $i
+            msgfmt --java2 --statistics -r $CLASS -l $LG -d ../jsp/WEB-INF/classes $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -120,7 +120,7 @@ do
             TDY=$TD2/net/i2p/i2ptunnel/web
             rm -rf $TD
             mkdir -p $TD $TDY
-            msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+            msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
diff --git a/apps/ministreaming/java/bundle-messages.sh b/apps/ministreaming/java/bundle-messages.sh
index 76c128f2a6bae204a83e731e3717a19b052db3f1..3092be3aa0c26eac7a9a7ce8bdbd67abd7203912 100755
--- a/apps/ministreaming/java/bundle-messages.sh
+++ b/apps/ministreaming/java/bundle-messages.sh
@@ -101,7 +101,7 @@ do
         then
             # slow way
             # convert to class files in build/obj
-            msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $i
+            msgfmt --java2 --statistics -r $CLASS -l $LG -d build/obj $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -119,7 +119,7 @@ do
             TDY=$TD2/net/i2p/client/streaming
             rm -rf $TD
             mkdir -p $TD $TDY
-            msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+            msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
diff --git a/apps/routerconsole/java/bundle-messages-countries.sh b/apps/routerconsole/java/bundle-messages-countries.sh
index 27ca2240b61a3a0f201c6f19e95f227b003aa302..5d8198744a4793a2fa2d2f425b9a0d52e77430e7 100755
--- a/apps/routerconsole/java/bundle-messages-countries.sh
+++ b/apps/routerconsole/java/bundle-messages-countries.sh
@@ -117,7 +117,7 @@ do
         then
             # slow way
             # convert to class files in build/obj
-            msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $i
+            msgfmt --java2 --statistics -r $CLASS -l $LG -d build/obj $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -135,7 +135,7 @@ do
             TDY=$TD2/net/i2p/router/countries
             rm -rf $TD
             mkdir -p $TD $TDY
-            msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+            msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
diff --git a/apps/routerconsole/java/bundle-messages-news.sh b/apps/routerconsole/java/bundle-messages-news.sh
index 1f03424276776729950ed503f05d4e8c145d0989..bf502dd23fee6d8bcc027429c16cd89862f2d9df 100755
--- a/apps/routerconsole/java/bundle-messages-news.sh
+++ b/apps/routerconsole/java/bundle-messages-news.sh
@@ -103,7 +103,7 @@ do
         then
             # slow way
             # convert to class files in build/obj
-            msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $i
+            msgfmt --java2 --statistics -r $CLASS -l $LG -d build/obj $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -121,7 +121,7 @@ do
             TDY=$TD2/net/i2p/router/news
             rm -rf $TD
             mkdir -p $TD $TDY
-            msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+            msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
diff --git a/apps/routerconsole/java/bundle-messages.sh b/apps/routerconsole/java/bundle-messages.sh
index 75a7184e406ec24dd3cb318cab51e5741e6497af..70ebd9d4c4fc5d2d56a2950e08f2d0bd0cb9b505 100755
--- a/apps/routerconsole/java/bundle-messages.sh
+++ b/apps/routerconsole/java/bundle-messages.sh
@@ -128,7 +128,7 @@ do
         then
             # slow way
             # convert to class files in build/obj
-            msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $i
+            msgfmt --java2 --statistics -r $CLASS -l $LG -d build/obj $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -146,7 +146,7 @@ do
             TDY=$TD2/net/i2p/router/web
             rm -rf $TD
             mkdir -p $TD $TDY
-            msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+            msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
diff --git a/apps/susidns/src/bundle-messages.sh b/apps/susidns/src/bundle-messages.sh
index c5a10ef73c24ff557b6f37bdc2dae3874ff7d31c..a35e32aa42c923f11db67566ecefedd3b4577058 100755
--- a/apps/susidns/src/bundle-messages.sh
+++ b/apps/susidns/src/bundle-messages.sh
@@ -109,7 +109,7 @@ do
         then
             # slow way
             # convert to class files in WEB-INF/classes
-            msgfmt --java --statistics -r $CLASS -l $LG -d WEB-INF/classes $i
+            msgfmt --java2 --statistics -r $CLASS -l $LG -d WEB-INF/classes $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -127,7 +127,7 @@ do
             TDY=$TD2/i2p/susi/dns
             rm -rf $TD
             mkdir -p $TD $TDY
-            msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+            msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
diff --git a/apps/susimail/bundle-messages.sh b/apps/susimail/bundle-messages.sh
index caf11eda7720477d2adc619c99ab145eb7c3041d..d939f8c6852b17bc7f9017b23e286fb5db26ab02 100644
--- a/apps/susimail/bundle-messages.sh
+++ b/apps/susimail/bundle-messages.sh
@@ -101,7 +101,7 @@ do
         then
             # slow way
             # convert to class files in src/WEB-INF/classes
-            msgfmt --java --statistics -r $CLASS -l $LG -d src/WEB-INF/classes $i
+            msgfmt --java2 --statistics -r $CLASS -l $LG -d src/WEB-INF/classes $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -119,7 +119,7 @@ do
             TDY=$TD2/i2p/susi/webmail
             rm -rf $TD
             mkdir -p $TD $TDY
-            msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+            msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
diff --git a/core/java/bundle-messages.sh b/core/java/bundle-messages.sh
index 3c8586b4f1505f06d5da41196361f3a9fd945471..2c58e625d599d6ed06dcee60bc673613ccd9c541 100755
--- a/core/java/bundle-messages.sh
+++ b/core/java/bundle-messages.sh
@@ -105,7 +105,7 @@ do
         then
             # slow way
             # convert to class files in build/obj
-            msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $i
+            msgfmt --java2 --statistics -r $CLASS -l $LG -d build/obj $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -123,7 +123,7 @@ do
             TDY=$TD2/net/i2p/util
             rm -rf $TD
             mkdir -p $TD $TDY
-            msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+            msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
diff --git a/router/java/bundle-messages.sh b/router/java/bundle-messages.sh
index f4aa36b257b23954a56f2edecdc10de24ec067b9..5690e69c2b84617d7bc1c38ccee5f0c99f8b98ab 100755
--- a/router/java/bundle-messages.sh
+++ b/router/java/bundle-messages.sh
@@ -107,7 +107,7 @@ do
         then
             # slow way
             # convert to class files in build/obj
-            msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $i
+            msgfmt --java2 --statistics -r $CLASS -l $LG -d build/obj $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -125,7 +125,7 @@ do
             TDY=$TD2/net/i2p/router/util
             rm -rf $TD
             mkdir -p $TD $TDY
-            msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+            msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"