diff --git a/source/java/org/alfresco/web/app/servlet/UploadFileServlet.java b/source/java/org/alfresco/web/app/servlet/UploadFileServlet.java
index 517c1103b6..a27a73bdcb 100644
--- a/source/java/org/alfresco/web/app/servlet/UploadFileServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/UploadFileServlet.java
@@ -75,6 +75,10 @@ public class UploadFileServlet extends BaseServlet
          
          HttpSession session = request.getSession();
          ServletFileUpload upload = new ServletFileUpload(new DiskFileItemFactory());
+         
+         // ensure that the encoding is handled correctly
+         upload.setHeaderEncoding("UTF-8");
+         
          List<FileItem> fileItems = upload.parseRequest(request);
          
          Iterator<FileItem> iter = fileItems.iterator();
@@ -94,9 +98,6 @@ public class UploadFileServlet extends BaseServlet
                String filename = item.getName();
                if (filename != null && filename.length() != 0)
                {
-                  // ensure that the encoding is handled correctly
-                  filename = new String(filename.getBytes(), "UTF8").toString();
-
                   if (logger.isDebugEnabled())
                      logger.debug("Processing uploaded file: " + filename);
                   
diff --git a/source/java/org/alfresco/web/ui/repo/tag/UploadFormTag.java b/source/java/org/alfresco/web/ui/repo/tag/UploadFormTag.java
index 0c5ca2eb8b..e08a506985 100644
--- a/source/java/org/alfresco/web/ui/repo/tag/UploadFormTag.java
+++ b/source/java/org/alfresco/web/ui/repo/tag/UploadFormTag.java
@@ -49,7 +49,7 @@ public class UploadFormTag extends TagSupport
       {
          Writer out = pageContext.getOut();
          
-         out.write("<form name='upload-form' method='post' enctype='multipart/form-data' action='");
+         out.write("<form name='upload-form' acceptCharset='UTF-8' method='post' enctype='multipart/form-data' action='");
          
          if (Application.inPortalServer())
          {