diff --git a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
index 9a84ded..c8c084a 100644
--- a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
+++ b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
@@ -185,6 +185,11 @@
         return getStringArrayProperty(FELIX_JETTY_EXCLUDED_SUITES, null);
     }
 
+    public int getHeaderSize()
+    {
+        return getIntProperty(FELIX_JETTY_HEADER_BUFFER_SIZE, 16 * 1024);
+    }
+
     public String getHost()
     {
         return getProperty(FELIX_HOST, null);
diff --git a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
index 9eb56fd..448804b 100644
--- a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
+++ b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
@@ -384,7 +384,9 @@
     private void configureConnector(final Connector connector, int port)
     {
         connector.setMaxIdleTime(this.config.getHttpTimeout());
+        connector.setRequestHeaderSize(this.config.getHeaderSize());
         connector.setRequestBufferSize(this.config.getRequestBufferSize());
+        connector.setResponseHeaderSize(this.config.getHeaderSize());
         connector.setResponseBufferSize(this.config.getResponseBufferSize());
         connector.setPort(port);
         connector.setHost(this.config.getHost());