diff --git a/scm-core/src/main/java/sonia/scm/ConfigChangedListener.java b/scm-core/src/main/java/sonia/scm/ConfigChangedListener.java
index a0b04943cd..78554574b1 100644
--- a/scm-core/src/main/java/sonia/scm/ConfigChangedListener.java
+++ b/scm-core/src/main/java/sonia/scm/ConfigChangedListener.java
@@ -37,8 +37,10 @@ package sonia.scm;
  * Callback listener for setting properties that are changed.
  *
  * @author Sebastian Sdorra
+ *
+ * @param <T> the type of configuration.
  */
-public interface ConfigChangedListener
+public interface ConfigChangedListener<T>
 {
 
   /**
@@ -48,5 +50,5 @@ public interface ConfigChangedListener
    *
    * @param config - the changed configuration object
    */
-  public void configChanged(Object config);
+  public void configChanged(T config);
 }
diff --git a/scm-core/src/main/java/sonia/scm/config/ScmConfiguration.java b/scm-core/src/main/java/sonia/scm/config/ScmConfiguration.java
index 8a1704bff3..35c55ab8a0 100644
--- a/scm-core/src/main/java/sonia/scm/config/ScmConfiguration.java
+++ b/scm-core/src/main/java/sonia/scm/config/ScmConfiguration.java
@@ -68,7 +68,8 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 @Singleton
 @XmlRootElement(name = "scm-config")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class ScmConfiguration implements ListenerSupport<ConfigChangedListener>
+public class ScmConfiguration
+        implements ListenerSupport<ConfigChangedListener<ScmConfiguration>>
 {
 
   /** Default JavaScript date format */
@@ -100,7 +101,7 @@ public class ScmConfiguration implements ListenerSupport<ConfigChangedListener>
    * @param listener
    */
   @Override
-  public void addListener(ConfigChangedListener listener)
+  public void addListener(ConfigChangedListener<ScmConfiguration> listener)
   {
     listeners.add(listener);
   }
@@ -113,7 +114,8 @@ public class ScmConfiguration implements ListenerSupport<ConfigChangedListener>
    * @param listeners
    */
   @Override
-  public void addListeners(Collection<ConfigChangedListener> listeners)
+  public void addListeners(
+          Collection<ConfigChangedListener<ScmConfiguration>> listeners)
   {
     listeners.addAll(listeners);
   }
diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java
index 7f0e21c185..971b4fbcb7 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java
@@ -82,7 +82,7 @@ import javax.xml.bind.Unmarshaller;
  */
 @Singleton
 public class DefaultPluginManager
-        implements PluginManager, ConfigChangedListener
+        implements PluginManager, ConfigChangedListener<ScmConfiguration>
 {
 
   /** Field description */
@@ -177,7 +177,7 @@ public class DefaultPluginManager
    * @param config
    */
   @Override
-  public void configChanged(Object config)
+  public void configChanged(ScmConfiguration config)
   {
     clearCache();
   }