diff --git a/scm-server-jetty/pom.xml b/scm-server-jetty/pom.xml
index c6f573b608..1fb23c0121 100644
--- a/scm-server-jetty/pom.xml
+++ b/scm-server-jetty/pom.xml
@@ -24,17 +24,23 @@
     </dependency>
 
     <dependency>
-      <groupId>org.eclipse.jetty.aggregate</groupId>
+      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
       <version>${jetty.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>org.eclipse.jetty.aggregate</groupId>
+      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-webapp</artifactId>
       <version>${jetty.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jmx</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+
   </dependencies>
 
   <properties>
diff --git a/scm-server/src/main/conf/server-config.xml b/scm-server/src/main/conf/server-config.xml
index 3d49d04963..1f03f30964 100644
--- a/scm-server/src/main/conf/server-config.xml
+++ b/scm-server/src/main/conf/server-config.xml
@@ -55,4 +55,24 @@
   </Call>
   -->
 
+  <!-- JMX support -->
+  <!--
+  <Call id="MBeanServer" class="java.lang.management.ManagementFactory"
+    name="getPlatformMBeanServer" />
+
+  <New id="MBeanContainer" class="org.eclipse.jetty.jmx.MBeanContainer">
+    <Arg>
+      <Ref id="MBeanServer" />
+    </Arg>
+  </New>
+
+  <Get id="Container" name="container">
+    <Call name="addEventListener">
+      <Arg>
+        <Ref id="MBeanContainer" />
+      </Arg>
+    </Call>
+  </Get>
+  -->
+
 </Configure>
diff --git a/scm-webapp/src/main/resources/logback.release.xml b/scm-webapp/src/main/resources/logback.release.xml
index 87549b53c8..4ea3d8a2de 100644
--- a/scm-webapp/src/main/resources/logback.release.xml
+++ b/scm-webapp/src/main/resources/logback.release.xml
@@ -10,6 +10,8 @@
 
 <configuration>
 
+  <jmxConfigurator />
+
   <define name="LOGDIR" class="sonia.scm.ScmLogFilePropertyDefiner" />
 
   <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">