diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java
index 66047e72eb..3bdd14f978 100644
--- a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java
+++ b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/RunMojo.java
@@ -60,6 +60,11 @@ import java.util.List;
 public class RunMojo extends AbstractBaseScmMojo
 {
 
+  /** Field description */
+  public static final int HEADERBUFFERSIZE = 16384;
+
+  //~--- methods --------------------------------------------------------------
+
   /**
    * Method description
    *
@@ -194,6 +199,8 @@ public class RunMojo extends AbstractBaseScmMojo
       Server server = new Server();
       SelectChannelConnector connector = new SelectChannelConnector();
 
+      connector.setRequestHeaderSize(HEADERBUFFERSIZE);
+
       if (openBrowser && Desktop.isDesktopSupported())
       {
         connector.addLifeCycleListener(new OpenBrowserListener(getLog(), port,
diff --git a/scm-server/src/main/conf/server-config.xml b/scm-server/src/main/conf/server-config.xml
index b2308ebb8c..5ccf211028 100644
--- a/scm-server/src/main/conf/server-config.xml
+++ b/scm-server/src/main/conf/server-config.xml
@@ -49,8 +49,9 @@
           <SystemProperty name="jetty.host" />
         </Set>
         <Set name="port">
-          <SystemProperty name="jetty.port" default="8080"/>
+          <SystemProperty name="jetty.port" default="8080" />
         </Set>
+        <Set name="requestHeaderSize">16384</Set>
         <!-- for mod_proxy -->
         <!--
         <Set name="forwarded">true</Set>
@@ -114,6 +115,7 @@
         <New class="org.eclipse.jetty.server.ssl.SslSelectChannelConnector">
         <Set name="Port">8181</Set>
         <Set name="maxIdleTime">30000</Set>
+        <Set name="requestHeaderSize">16384</Set>
         <Set name="keystore"><SystemProperty name="basedir" default="." />/conf/keystore.jks</Set>
         <Set name="password">OBF:xxx</Set>
         <Set name="keyPassword">OBF:xxx</Set>
diff --git a/scm-webapp/src/main/webapp/WEB-INF/glassfish-web.xml b/scm-webapp/src/main/webapp/WEB-INF/glassfish-web.xml
index 51b68b36f9..c7da04b836 100644
--- a/scm-webapp/src/main/webapp/WEB-INF/glassfish-web.xml
+++ b/scm-webapp/src/main/webapp/WEB-INF/glassfish-web.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
 <!--
 
     Copyright (c) 2010, Sebastian Sdorra
@@ -31,7 +32,6 @@
 
 
 -->
-<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
 <glassfish-web-app error-url="">
   <context-root>/scm</context-root>
   <class-loader delegate="false"/>