diff --git a/plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java b/plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java
index 275471e385..8a91f50b24 100644
--- a/plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java
+++ b/plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java
@@ -35,12 +35,14 @@ package sonia.scm.repository;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 
 import sonia.scm.Type;
 import sonia.scm.plugin.ext.Extension;
+import sonia.scm.store.StoreFactory;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -66,6 +68,20 @@ public class GitRepositoryHandler
   /** Field description */
   public static final Type TYPE = new Type(TYPE_NAME, TYPE_DISPLAYNAME);
 
+  //~--- constructors ---------------------------------------------------------
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param storeFactory
+   */
+  @Inject
+  public GitRepositoryHandler(StoreFactory storeFactory)
+  {
+    super(storeFactory);
+  }
+
   //~--- get methods ----------------------------------------------------------
 
   /**
diff --git a/plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java b/plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java
index aeed42614d..b61a435731 100644
--- a/plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java
+++ b/plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java
@@ -35,6 +35,7 @@ package sonia.scm.repository;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
 import sonia.scm.Type;
@@ -43,6 +44,7 @@ import sonia.scm.io.INIConfiguration;
 import sonia.scm.io.INIConfigurationWriter;
 import sonia.scm.io.INISection;
 import sonia.scm.plugin.ext.Extension;
+import sonia.scm.store.StoreFactory;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -68,6 +70,20 @@ public class HgRepositoryHandler
   /** Field description */
   public static final Type TYPE = new Type(TYPE_NAME, TYPE_DISPLAYNAME);
 
+  //~--- constructors ---------------------------------------------------------
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param storeFactory
+   */
+  @Inject
+  public HgRepositoryHandler(StoreFactory storeFactory)
+  {
+    super(storeFactory);
+  }
+
   //~--- methods --------------------------------------------------------------
 
   /**
diff --git a/plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java b/plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java
index a113c7003a..4afbce9bac 100644
--- a/plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java
+++ b/plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java
@@ -35,6 +35,7 @@ package sonia.scm.repository;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
 import org.tmatesoft.svn.core.SVNException;
@@ -42,6 +43,7 @@ import org.tmatesoft.svn.core.io.SVNRepositoryFactory;
 
 import sonia.scm.Type;
 import sonia.scm.plugin.ext.Extension;
+import sonia.scm.store.StoreFactory;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -67,6 +69,20 @@ public class SvnRepositoryHandler
   /** Field description */
   public static final Type TYPE = new Type(TYPE_NAME, TYPE_DISPLAYNAME);
 
+  //~--- constructors ---------------------------------------------------------
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param storeFactory
+   */
+  @Inject
+  public SvnRepositoryHandler(StoreFactory storeFactory)
+  {
+    super(storeFactory);
+  }
+
   //~--- get methods ----------------------------------------------------------
 
   /**
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 23743fa6e4..efbef77f58 100644
--- a/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
@@ -40,7 +40,8 @@ import org.slf4j.LoggerFactory;
 
 import sonia.scm.ConfigChangedListener;
 import sonia.scm.SCMContextProvider;
-import sonia.scm.util.IOUtil;
+import sonia.scm.store.Store;
+import sonia.scm.store.StoreFactory;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -50,8 +51,6 @@ import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.xml.bind.JAXB;
-
 /**
  *
  * @author Sebastian Sdorra
@@ -66,6 +65,19 @@ public abstract class AbstractRepositoryHandler<C extends SimpleRepositoryConfig
   private static final Logger logger =
     LoggerFactory.getLogger(AbstractRepositoryHandler.class);
 
+  //~--- constructors ---------------------------------------------------------
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param storeFactory
+   */
+  protected AbstractRepositoryHandler(StoreFactory storeFactory)
+  {
+    this.store = storeFactory.getStore(getConfigClass(), getType().getName());
+  }
+
   //~--- get methods ----------------------------------------------------------
 
   /**
@@ -115,9 +127,6 @@ public abstract class AbstractRepositoryHandler<C extends SimpleRepositoryConfig
     String name = getType().getName();
 
     baseDirectory = context.getBaseDirectory();
-    configFile =
-      new File(baseDirectory,
-               "config".concat(File.separator).concat(name).concat(".xml"));
     loadConfig();
   }
 
@@ -127,15 +136,12 @@ public abstract class AbstractRepositoryHandler<C extends SimpleRepositoryConfig
    */
   public void loadConfig()
   {
-    if (configFile.exists())
+    if (logger.isDebugEnabled())
     {
-      if (logger.isDebugEnabled())
-      {
-        logger.debug("load config {}", configFile.getPath());
-      }
-
-      config = JAXB.unmarshal(configFile, getConfigClass());
+      logger.debug("load config from store");
     }
+
+    config = store.get();
   }
 
   /**
@@ -160,13 +166,10 @@ public abstract class AbstractRepositoryHandler<C extends SimpleRepositoryConfig
     {
       if (logger.isDebugEnabled())
       {
-        logger.debug("store config {}", configFile.getPath());
+        logger.debug("store config");
       }
 
-      File parent = configFile.getParentFile();
-
-      IOUtil.mkdirs(parent);
-      JAXB.marshal(config, configFile);
+      store.set(config);
     }
   }
 
@@ -232,7 +235,7 @@ public abstract class AbstractRepositoryHandler<C extends SimpleRepositoryConfig
   protected C config;
 
   /** Field description */
-  protected File configFile;
+  protected Store<C> store;
 
   /** Field description */
   private Set<ConfigChangedListener> listenerSet =
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 333e5e1111..410d16ac33 100644
--- a/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
@@ -42,6 +42,7 @@ import sonia.scm.ConfigurationException;
 import sonia.scm.SCMContextProvider;
 import sonia.scm.io.CommandResult;
 import sonia.scm.io.ExtendedCommand;
+import sonia.scm.store.StoreFactory;
 import sonia.scm.util.IOUtil;
 
 //~--- JDK imports ------------------------------------------------------------
@@ -67,6 +68,19 @@ public abstract class AbstractSimpleRepositoryHandler<C extends SimpleRepository
   private static final Logger logger =
     LoggerFactory.getLogger(AbstractSimpleRepositoryHandler.class);
 
+  //~--- constructors ---------------------------------------------------------
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param storeFactory
+   */
+  public AbstractSimpleRepositoryHandler(StoreFactory storeFactory)
+  {
+    super(storeFactory);
+  }
+
   //~--- methods --------------------------------------------------------------
 
   /**
diff --git a/scm-core/src/main/java/sonia/scm/repository/SimpleRepositoryConfig.java b/scm-core/src/main/java/sonia/scm/repository/SimpleRepositoryConfig.java
index ac28287753..756d2ac4de 100644
--- a/scm-core/src/main/java/sonia/scm/repository/SimpleRepositoryConfig.java
+++ b/scm-core/src/main/java/sonia/scm/repository/SimpleRepositoryConfig.java
@@ -41,10 +41,13 @@ import sonia.scm.Validateable;
 
 import java.io.File;
 
+import javax.xml.bind.annotation.XmlRootElement;
+
 /**
  *
  * @author Sebastian Sdorra
  */
+@XmlRootElement
 public class SimpleRepositoryConfig implements Validateable
 {
 
diff --git a/scm-test/src/main/java/sonia/scm/repository/DummyRepositoryHandler.java b/scm-test/src/main/java/sonia/scm/repository/DummyRepositoryHandler.java
index 89ac396c01..fa27959341 100644
--- a/scm-test/src/main/java/sonia/scm/repository/DummyRepositoryHandler.java
+++ b/scm-test/src/main/java/sonia/scm/repository/DummyRepositoryHandler.java
@@ -36,7 +36,7 @@ package sonia.scm.repository;
 //~--- non-JDK imports --------------------------------------------------------
 
 import sonia.scm.Type;
-import sonia.scm.util.IOUtil;
+import sonia.scm.store.StoreFactory;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -60,6 +60,19 @@ public class DummyRepositoryHandler
   /** Field description */
   public static final Type TYPE = new Type(TYPE_NAME, TYPE_DISPLAYNAME);
 
+  //~--- constructors ---------------------------------------------------------
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param storeFactory
+   */
+  public DummyRepositoryHandler(StoreFactory storeFactory)
+  {
+    super(storeFactory);
+  }
+
   //~--- get methods ----------------------------------------------------------
 
   /**
diff --git a/scm-webapp/src/test/java/sonia/scm/repository/XmlRepositoryManagerTest.java b/scm-webapp/src/test/java/sonia/scm/repository/XmlRepositoryManagerTest.java
index 742fe71519..48662341fc 100644
--- a/scm-webapp/src/test/java/sonia/scm/repository/XmlRepositoryManagerTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/repository/XmlRepositoryManagerTest.java
@@ -62,12 +62,10 @@ public class XmlRepositoryManagerTest extends RepositoryManagerTestBase
   protected Manager<Repository, RepositoryException> createManager()
   {
     Set<RepositoryHandler> handlerSet = new HashSet<RepositoryHandler>();
-
-    handlerSet.add(new DummyRepositoryHandler());
-
     StoreFactory factory = new JAXBStoreFactory();
 
     factory.init(provider);
+    handlerSet.add(new DummyRepositoryHandler(factory));
 
     return new XmlRepositoryManager(getAdminSecurityContextProvider(), factory,
                                     handlerSet);