diff --git a/www/helma/files/patch-src_helma_framework_RequestTrans.java b/www/helma/files/patch-src_helma_framework_RequestTrans.java
new file mode 100644
index 000000000000..ea8aa0aded7f
--- /dev/null
+++ b/www/helma/files/patch-src_helma_framework_RequestTrans.java
@@ -0,0 +1,15 @@
+--- src/helma/framework/RequestTrans.java.orig	2015-09-16 00:39:16 UTC
++++ src/helma/framework/RequestTrans.java
+@@ -602,10 +602,10 @@ public class RequestTrans implements Ser
+         StringTokenizer tok;
+ 
+         if (auth.startsWith("Basic ")) {
+-            tok = new StringTokenizer(new String(Base64.decode((auth.substring(6)).toCharArray())),
++            tok = new StringTokenizer(new String(helma.util.Base64.decode((auth.substring(6)).toCharArray())),
+                                       ":");
+         } else {
+-            tok = new StringTokenizer(new String(Base64.decode(auth.toCharArray())), ":");
++            tok = new StringTokenizer(new String(helma.util.Base64.decode(auth.toCharArray())), ":");
+         }
+ 
+         try {
diff --git a/www/helma/files/patch-src_helma_framework_ResponseTrans.java b/www/helma/files/patch-src_helma_framework_ResponseTrans.java
new file mode 100644
index 000000000000..c46564b32b1b
--- /dev/null
+++ b/www/helma/files/patch-src_helma_framework_ResponseTrans.java
@@ -0,0 +1,27 @@
+--- src/helma/framework/ResponseTrans.java.orig	2015-09-16 00:39:16 UTC
++++ src/helma/framework/ResponseTrans.java
+@@ -714,7 +714,7 @@ public final class ResponseTrans extends
+                 // if (contentType != null)
+                 //     digest.update (contentType.getBytes());
+                 byte[] b = digest.digest(response);
+-                etag = "\"" + new String(Base64.encode(b)) + "\"";
++                etag = "\"" + new String(helma.util.Base64.encode(b)) + "\"";
+                 // only set response to 304 not modified if no cookies were set
+                 if (reqtrans.hasETag(etag) && countCookies() == 0) {
+                     response = new byte[0];
+@@ -891,7 +891,7 @@ public final class ResponseTrans extends
+         // generation sensitive to changes in the app
+         byte[] b = digest.digest(MD5Encoder.toBytes(app.getChecksum()));
+ 
+-        setETag(new String(Base64.encode(b)));
++        setETag(new String(helma.util.Base64.encode(b)));
+     }
+ 
+     /**
+@@ -1164,4 +1164,4 @@ public final class ResponseTrans extends
+     public void setRealm(String realm) {
+         this.realm = realm;
+     }
+-}
+\ No newline at end of file
++}
diff --git a/www/helma/files/patch-src_helma_servlet_AbstractServletClient.java b/www/helma/files/patch-src_helma_servlet_AbstractServletClient.java
new file mode 100644
index 000000000000..89fc27bac544
--- /dev/null
+++ b/www/helma/files/patch-src_helma_servlet_AbstractServletClient.java
@@ -0,0 +1,11 @@
+--- src/helma/servlet/AbstractServletClient.java.orig	2015-09-16 00:39:16 UTC
++++ src/helma/servlet/AbstractServletClient.java
+@@ -510,7 +510,7 @@ public abstract class AbstractServletCli
+             checksum[i] = (byte) (n);
+             n >>>= 8;
+         }
+-        String etag = "\"" + new String(Base64.encode(checksum)) + "\"";
++        String etag = "\"" + new String(helma.util.Base64.encode(checksum)) + "\"";
+         res.setHeader("ETag", etag);
+         String etagHeader = req.getHeader("If-None-Match");
+         if (etagHeader != null) {