diff --git a/apps/desktopgui/bundle-messages.sh b/apps/desktopgui/bundle-messages.sh
index 5e747a0ab..7302140c1 100755
--- a/apps/desktopgui/bundle-messages.sh
+++ b/apps/desktopgui/bundle-messages.sh
@@ -138,7 +138,12 @@ do
                 RC=1
                 break
             fi
-            mv $TDX/messages_$LG.java $TDY
+            # fixup Enumeration code for generics
+            sed -e 's/Enumeration/Enumeration<String>/g' \
+                -e 's/Object nextElement/String nextElement/g' \
+                -e 's/return key/return (String) key/g' \
+                $TDX/messages_$LG.java > $TDY/messages_$LG.java
+            rm -f $TDX/messages_$LG.java
             rm -rf $TD
         fi
     fi
diff --git a/apps/i2psnark/java/bundle-messages.sh b/apps/i2psnark/java/bundle-messages.sh
index 4f5546639..e66f0d99e 100755
--- a/apps/i2psnark/java/bundle-messages.sh
+++ b/apps/i2psnark/java/bundle-messages.sh
@@ -129,7 +129,12 @@ do
                 RC=1
                 break
             fi
-            mv $TDX/messages_$LG.java $TDY
+            # fixup Enumeration code for generics
+            sed -e 's/Enumeration/Enumeration<String>/g' \
+                -e 's/Object nextElement/String nextElement/g' \
+                -e 's/return key/return (String) key/g' \
+                $TDX/messages_$LG.java > $TDY/messages_$LG.java
+            rm -f $TDX/messages_$LG.java
             rm -rf $TD
         fi
     fi
diff --git a/apps/i2ptunnel/java/bundle-messages-proxy.sh b/apps/i2ptunnel/java/bundle-messages-proxy.sh
index 860ceb9ec..59b3139a7 100755
--- a/apps/i2ptunnel/java/bundle-messages-proxy.sh
+++ b/apps/i2ptunnel/java/bundle-messages-proxy.sh
@@ -131,7 +131,12 @@ do
                 RC=1
                 break
             fi
-            mv $TDX/messages_$LG.java $TDY
+            # fixup Enumeration code for generics
+            sed -e 's/Enumeration/Enumeration<String>/g' \
+                -e 's/Object nextElement/String nextElement/g' \
+                -e 's/return key/return (String) key/g' \
+                $TDX/messages_$LG.java > $TDY/messages_$LG.java
+            rm -f $TDX/messages_$LG.java
             rm -rf $TD
         fi
     fi
diff --git a/apps/i2ptunnel/java/bundle-messages.sh b/apps/i2ptunnel/java/bundle-messages.sh
index d10e2d89c..c78d892fd 100755
--- a/apps/i2ptunnel/java/bundle-messages.sh
+++ b/apps/i2ptunnel/java/bundle-messages.sh
@@ -130,7 +130,12 @@ do
                 RC=1
                 break
             fi
-            mv $TDX/messages_$LG.java $TDY
+            # fixup Enumeration code for generics
+            sed -e 's/Enumeration/Enumeration<String>/g' \
+                -e 's/Object nextElement/String nextElement/g' \
+                -e 's/return key/return (String) key/g' \
+                $TDX/messages_$LG.java > $TDY/messages_$LG.java
+            rm -f $TDX/messages_$LG.java
             rm -rf $TD
         fi
     fi
diff --git a/apps/ministreaming/java/bundle-messages.sh b/apps/ministreaming/java/bundle-messages.sh
index cdc4e3c2e..1f567f05f 100755
--- a/apps/ministreaming/java/bundle-messages.sh
+++ b/apps/ministreaming/java/bundle-messages.sh
@@ -129,7 +129,12 @@ do
                 RC=1
                 break
             fi
-            mv $TDX/messages_$LG.java $TDY
+            # fixup Enumeration code for generics
+            sed -e 's/Enumeration/Enumeration<String>/g' \
+                -e 's/Object nextElement/String nextElement/g' \
+                -e 's/return key/return (String) key/g' \
+                $TDX/messages_$LG.java > $TDY/messages_$LG.java
+            rm -f $TDX/messages_$LG.java
             rm -rf $TD
         fi
     fi
diff --git a/apps/routerconsole/java/bundle-messages-countries.sh b/apps/routerconsole/java/bundle-messages-countries.sh
index ca9067012..229709fff 100755
--- a/apps/routerconsole/java/bundle-messages-countries.sh
+++ b/apps/routerconsole/java/bundle-messages-countries.sh
@@ -145,7 +145,12 @@ do
                 RC=1
                 break
             fi
-            mv $TDX/messages_$LG.java $TDY
+            # fixup Enumeration code for generics
+            sed -e 's/Enumeration/Enumeration<String>/g' \
+                -e 's/Object nextElement/String nextElement/g' \
+                -e 's/return key/return (String) key/g' \
+                $TDX/messages_$LG.java > $TDY/messages_$LG.java
+            rm -f $TDX/messages_$LG.java
             rm -rf $TD
         fi
     fi
diff --git a/apps/routerconsole/java/bundle-messages-news.sh b/apps/routerconsole/java/bundle-messages-news.sh
index b43641b02..007e7b183 100755
--- a/apps/routerconsole/java/bundle-messages-news.sh
+++ b/apps/routerconsole/java/bundle-messages-news.sh
@@ -131,7 +131,12 @@ do
                 RC=1
                 break
             fi
-            mv $TDX/messages_$LG.java $TDY
+            # fixup Enumeration code for generics
+            sed -e 's/Enumeration/Enumeration<String>/g' \
+                -e 's/Object nextElement/String nextElement/g' \
+                -e 's/return key/return (String) key/g' \
+                $TDX/messages_$LG.java > $TDY/messages_$LG.java
+            rm -f $TDX/messages_$LG.java
             rm -rf $TD
         fi
     fi
diff --git a/apps/routerconsole/java/bundle-messages.sh b/apps/routerconsole/java/bundle-messages.sh
index 2383822e7..a331dd335 100755
--- a/apps/routerconsole/java/bundle-messages.sh
+++ b/apps/routerconsole/java/bundle-messages.sh
@@ -161,7 +161,12 @@ do
                 RC=1
                 break
             fi
-            mv $TDX/messages_$LG.java $TDY
+            # fixup Enumeration code for generics
+            sed -e 's/Enumeration/Enumeration<String>/g' \
+                -e 's/Object nextElement/String nextElement/g' \
+                -e 's/return key/return (String) key/g' \
+                $TDX/messages_$LG.java > $TDY/messages_$LG.java
+            rm -f $TDX/messages_$LG.java
             rm -rf $TD
         fi
     fi
diff --git a/apps/susidns/src/bundle-messages.sh b/apps/susidns/src/bundle-messages.sh
index 40eb9f406..cb5dd5101 100755
--- a/apps/susidns/src/bundle-messages.sh
+++ b/apps/susidns/src/bundle-messages.sh
@@ -137,7 +137,12 @@ do
                 RC=1
                 break
             fi
-            mv $TDX/messages_$LG.java $TDY
+            # fixup Enumeration code for generics
+            sed -e 's/Enumeration/Enumeration<String>/g' \
+                -e 's/Object nextElement/String nextElement/g' \
+                -e 's/return key/return (String) key/g' \
+                $TDX/messages_$LG.java > $TDY/messages_$LG.java
+            rm -f $TDX/messages_$LG.java
             rm -rf $TD
         fi
     fi
diff --git a/apps/susimail/bundle-messages.sh b/apps/susimail/bundle-messages.sh
index 6733c370b..80aafa1a9 100755
--- a/apps/susimail/bundle-messages.sh
+++ b/apps/susimail/bundle-messages.sh
@@ -129,7 +129,12 @@ do
                 RC=1
                 break
             fi
-            mv $TDX/messages_$LG.java $TDY
+            # fixup Enumeration code for generics
+            sed -e 's/Enumeration/Enumeration<String>/g' \
+                -e 's/Object nextElement/String nextElement/g' \
+                -e 's/return key/return (String) key/g' \
+                $TDX/messages_$LG.java > $TDY/messages_$LG.java
+            rm -f $TDX/messages_$LG.java
             rm -rf $TD
         fi
     fi
diff --git a/core/java/bundle-messages.sh b/core/java/bundle-messages.sh
index a5a2b5d39..a55ab7e4f 100755
--- a/core/java/bundle-messages.sh
+++ b/core/java/bundle-messages.sh
@@ -135,7 +135,12 @@ do
                 RC=1
                 break
             fi
-            mv $TDX/messages_$LG.java $TDY
+            # fixup Enumeration code for generics
+            sed -e 's/Enumeration/Enumeration<String>/g' \
+                -e 's/Object nextElement/String nextElement/g' \
+                -e 's/return key/return (String) key/g' \
+                $TDX/messages_$LG.java > $TDY/messages_$LG.java
+            rm -f $TDX/messages_$LG.java
             rm -rf $TD
         fi
     fi
diff --git a/router/java/bundle-messages.sh b/router/java/bundle-messages.sh
index 96a8c6e70..ef2d4476e 100755
--- a/router/java/bundle-messages.sh
+++ b/router/java/bundle-messages.sh
@@ -135,7 +135,12 @@ do
                 RC=1
                 break
             fi
-            mv $TDX/messages_$LG.java $TDY
+            # fixup Enumeration code for generics
+            sed -e 's/Enumeration/Enumeration<String>/g' \
+                -e 's/Object nextElement/String nextElement/g' \
+                -e 's/return key/return (String) key/g' \
+                $TDX/messages_$LG.java > $TDY/messages_$LG.java
+            rm -f $TDX/messages_$LG.java
             rm -rf $TD
         fi
     fi