diff --git a/scm-server-jetty/src/main/java/sonia/scm/server/jetty/JettyServer.java b/scm-server-jetty/src/main/java/sonia/scm/server/jetty/JettyServer.java
index d339118604..0feca425d2 100644
--- a/scm-server-jetty/src/main/java/sonia/scm/server/jetty/JettyServer.java
+++ b/scm-server-jetty/src/main/java/sonia/scm/server/jetty/JettyServer.java
@@ -35,7 +35,6 @@ package sonia.scm.server.jetty;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import org.eclipse.jetty.webapp.WebAppContext;
 import org.eclipse.jetty.xml.XmlConfiguration;
 
 import sonia.scm.server.Server;
@@ -126,12 +125,6 @@ public class JettyServer implements Server
         server.addLifeCycleListener(new JettyServerListenerAdapter(listener));
       }
 
-      WebAppContext wac = new WebAppContext();
-
-      wac.setWar(webapp.getAbsolutePath());
-      wac.setExtractWAR(true);
-      server.setHandler(wac);
-
       // server.setStopAtShutdown(true);
       server.start();
       server.join();
diff --git a/scm-server/src/main/conf/server-config.xml b/scm-server/src/main/conf/server-config.xml
index 1f03f30964..832a16b5c2 100644
--- a/scm-server/src/main/conf/server-config.xml
+++ b/scm-server/src/main/conf/server-config.xml
@@ -27,6 +27,39 @@
     </Arg>
   </Call>
 
+  <New id="scm-webapp" class="org.eclipse.jetty.webapp.WebAppContext">
+    <Set name="contextPath">/scm</Set>
+    <Set name="war">webapp/scm-webapp.war</Set>
+  </New>
+
+  <New id="docroot" class="org.eclipse.jetty.webapp.WebAppContext">
+    <Set name="contextPath">/</Set>
+    <Set name="baseResource">
+      <New class="org.eclipse.jetty.util.resource.ResourceCollection">
+        <Arg>
+          <Array type="java.lang.String">
+            <Item>webapp/docroot</Item>
+          </Array>
+        </Arg>
+      </New>
+    </Set>
+  </New>
+  
+  <Set name="handler">
+    <New class="org.eclipse.jetty.server.handler.HandlerCollection">
+      <Set name="handlers">
+        <Array type="org.eclipse.jetty.server.Handler">
+          <Item>
+            <Ref id="scm-webapp" />
+          </Item>
+          <Item>
+            <Ref id="docroot" />
+          </Item>
+        </Array>
+      </Set>
+    </New>
+  </Set>
+
   <!-- mod_proxy_ajp or mod_jk -->
   <!--
   <Call name="addConnector">