diff --git a/src/helma/main/ApplicationManager.java b/src/helma/main/ApplicationManager.java
index f591b5e7..8e1427dd 100644
--- a/src/helma/main/ApplicationManager.java
+++ b/src/helma/main/ApplicationManager.java
@@ -84,6 +84,7 @@ public class ApplicationManager {
 	                        app.setBaseURI (mountpoint);
 	                    ServletHttpContext context = new ServletHttpContext ();
 	                    context.setContextPath(pattern);
+	                    context.addHandler(new ContentEncodingHandler());
 	                    server.http.addContext (context);
 	                    ServletHolder holder = context.addServlet (appName, "/*", "helma.servlet.EmbeddedServletClient");
 	                    holder.setInitParameter ("application", appName);
@@ -170,6 +171,7 @@ public class ApplicationManager {
 	        String pattern = getPathPattern (mountpoint);
 	        ServletHttpContext context = new ServletHttpContext ();
 	        context.setContextPath(pattern);
+	        context.addHandler(new ContentEncodingHandler());
 	        server.http.addContext (context);
 	        ServletHolder holder = context.addServlet (appName, "/*", "helma.servlet.EmbeddedServletClient");
 	        holder.setInitParameter ("application", appName);