diff --git a/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java b/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
index b3c6a949f5..91a2ee357f 100644
--- a/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
@@ -40,6 +40,7 @@ import org.slf4j.LoggerFactory;
 
 import sonia.scm.ConfigChangedListener;
 import sonia.scm.SCMContextProvider;
+import sonia.scm.util.IOUtil;
 import sonia.scm.util.Util;
 
 //~--- JDK imports ------------------------------------------------------------
@@ -164,6 +165,9 @@ public abstract class AbstractRepositoryHandler<C extends BasicRepositoryConfig>
         logger.debug("store config {}", configFile.getPath());
       }
 
+      File parent = configFile.getParentFile();
+
+      IOUtil.mkdirs(parent);
       JAXB.marshal(config, configFile);
     }
   }
diff --git a/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java b/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
index dce645705e..24b8056801 100644
--- a/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
@@ -172,6 +172,7 @@ public abstract class AbstractSimpleRepositoryHandler<C extends SimpleRepository
         }
 
         IOUtil.mkdirs(repositoryDirectory);
+        storeConfig();
       }
     }
   }