diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index 17c4bd266f..31212a9203 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -455,9 +455,6 @@
         <artifactId>jetty-maven-plugin</artifactId>
         <version>${jetty.version}</version>
         <configuration>
-          <httpConnector>
-            <port>8081</port>
-          </httpConnector>
           <stopPort>8005</stopPort>
           <stopKey>STOP</stopKey>
           <systemProperties>
diff --git a/scm-webapp/src/main/conf/jetty.xml b/scm-webapp/src/main/conf/jetty.xml
index 6abd6e54c7..ec7ac555c8 100644
--- a/scm-webapp/src/main/conf/jetty.xml
+++ b/scm-webapp/src/main/conf/jetty.xml
@@ -31,7 +31,7 @@ http://bitbucket.org/sdorra/scm-manager
 
 -->
 
-<Configure id="ScmServer" class="org.eclipse.jetty.server.Server">
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
 
   <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
     <!-- increase header size for mercurial -->
@@ -39,4 +39,34 @@ http://bitbucket.org/sdorra/scm-manager
     <Set name="responseHeaderSize">16384</Set>
   </New>
   
+  <Call id="httpConnector" name="addConnector">
+    <Arg>
+      <New class="org.eclipse.jetty.server.ServerConnector">
+        <Arg name="server">
+          <Ref refid="Server" />
+        </Arg>
+        <Arg name="factories">
+          <Array type="org.eclipse.jetty.server.ConnectionFactory">
+            <Item>
+              <New class="org.eclipse.jetty.server.HttpConnectionFactory">
+                <Arg name="config">
+                  <Ref refid="httpConfig" />
+                </Arg>
+              </New>
+            </Item>
+          </Array>
+        </Arg>
+        <Set name="host">
+          <Property name="jetty.host" />
+        </Set>
+        <Set name="port">
+          <Property name="jetty.port" default="8081" />
+        </Set>
+        <Set name="idleTimeout">
+          <Property name="http.timeout" default="30000"/>
+        </Set>
+      </New>
+    </Arg>
+  </Call>
+  
 </Configure>
\ No newline at end of file