diff --git a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
index fd872138e0..9b32167682 100644
--- a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
+++ b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
@@ -353,7 +353,7 @@ public class ScmServletModule extends ServletModule
   }
 
   /**
-   * Method description
+   * Load ScmConfiguration with JAXB
    *
    *
    * @param context
@@ -367,6 +367,11 @@ public class ScmServletModule extends ServletModule
 
     if (file.exists())
     {
+      if (logger.isInfoEnabled())
+      {
+        logger.info("load ScmConfiguration: {}", file);
+      }
+
       try
       {
         config = JAXB.unmarshal(file, ScmConfiguration.class);
@@ -381,6 +386,10 @@ public class ScmServletModule extends ServletModule
         logger.error(ex.getMessage(), ex);
       }
     }
+    else if (logger.isWarnEnabled())
+    {
+      logger.warn("could not find ScmConfiguration at {}", file);
+    }
 
     if (config == null)
     {
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/ConfigurationResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/ConfigurationResource.java
index b8b5662317..4ee9d5f582 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/ConfigurationResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/ConfigurationResource.java
@@ -39,6 +39,9 @@ import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.google.inject.Singleton;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import sonia.scm.SCMContext;
 import sonia.scm.config.ScmConfiguration;
 import sonia.scm.plugin.PluginManager;
@@ -71,6 +74,12 @@ import javax.xml.bind.JAXB;
 public class ConfigurationResource
 {
 
+  /** the logger for ConfigurationResource */
+  private static final Logger logger =
+    LoggerFactory.getLogger(ConfigurationResource.class);
+
+  //~--- constructors ---------------------------------------------------------
+
   /**
    * Constructs ...
    *
@@ -150,6 +159,11 @@ public class ConfigurationResource
         IOUtil.mkdirs(file.getParentFile());
       }
 
+      if (logger.isInfoEnabled())
+      {
+        logger.info("write ScmConfiguration to {}", file);
+      }
+
       JAXB.marshal(configuration, file);
     }