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 2a459b66d6..c6eb210322 100644
--- a/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
@@ -275,15 +275,15 @@ public abstract class AbstractRepositoryHandler<C extends SimpleRepositoryConfig
   }
 
   /**
-   * Method description
+   * Returns true if the plugin is configured and enabled.
    *
    *
-   * @return
+   * @return true if the plugin is configured and enabled
    */
   @Override
   public boolean isConfigured()
   {
-    return (config != null) && config.isValid();
+    return (config != null) && config.isValid() &&!config.isDisabled();
   }
 
   //~--- set 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 43376979ff..3654b9c8b4 100644
--- a/scm-core/src/main/java/sonia/scm/repository/SimpleRepositoryConfig.java
+++ b/scm-core/src/main/java/sonia/scm/repository/SimpleRepositoryConfig.java
@@ -63,6 +63,18 @@ public class SimpleRepositoryConfig implements Validateable
     return repositoryDirectory;
   }
 
+  /**
+   * Returns true if the plugin is disabled.
+   *
+   *
+   * @return true if the plugin is disabled
+   * @since 1.13
+   */
+  public boolean isDisabled()
+  {
+    return disabled;
+  }
+
   /**
    * Returns true if the configuration object is valid.
    *
@@ -77,6 +89,18 @@ public class SimpleRepositoryConfig implements Validateable
 
   //~--- set methods ----------------------------------------------------------
 
+  /**
+   * Enable or disable the plugin.
+   *
+   *
+   * @param disabled
+   * @since 1.13
+   */
+  public void setDisabled(boolean disabled)
+  {
+    this.disabled = disabled;
+  }
+
   /**
    * Sets the directory for the repositories
    *
@@ -90,6 +114,9 @@ public class SimpleRepositoryConfig implements Validateable
 
   //~--- fields ---------------------------------------------------------------
 
-  /** Field description */
+  /** true if the plugin is disabled */
+  private boolean disabled = false;
+
+  /** directory for repositories */
   private File repositoryDirectory;
 }
diff --git a/scm-plugins/scm-git-plugin/src/main/resources/sonia/scm/git.config.js b/scm-plugins/scm-git-plugin/src/main/resources/sonia/scm/git.config.js
index 52e79734f2..8cf02780b8 100644
--- a/scm-plugins/scm-git-plugin/src/main/resources/sonia/scm/git.config.js
+++ b/scm-plugins/scm-git-plugin/src/main/resources/sonia/scm/git.config.js
@@ -36,9 +36,12 @@ Sonia.git.ConfigPanel = Ext.extend(Sonia.config.SimpleConfigForm, {
   // labels
   titleText: 'Git Settings',
   repositoryDirectoryText: 'Repository directory',
+  disabledText: 'Disabled',
 
   // helpTexts
   repositoryDirectoryHelpText: 'Location of the Git repositories.',
+  disabledHelpText: 'Enable or disable the Git plugin.\n\
+                    Note you have to reload the page, after changing this value.',
 
   initComponent: function(){
 
@@ -51,6 +54,12 @@ Sonia.git.ConfigPanel = Ext.extend(Sonia.config.SimpleConfigForm, {
         fieldLabel: this.repositoryDirectoryText,
         helpText: this.repositoryDirectoryHelpText,
         allowBlank : false
+      },{
+        xtype: 'checkbox',
+        name: 'disabled',
+        fieldLabel: this.disabledText,
+        inputValue: 'true',
+        helpText: this.disabledHelpText
       }]
     }
 
@@ -71,9 +80,12 @@ if ( i18n != null && i18n.country == 'de' ){
     // labels
     titleText: 'Git Einstellungen',
     repositoryDirectoryText: 'Repository-Verzeichnis',
+    disabledText: 'Deaktivieren',
 
     // helpTexts
-    repositoryDirectoryHelpText: 'Verzeichnis der Git-Repositories.'
+    repositoryDirectoryHelpText: 'Verzeichnis der Git-Repositories.',
+    disabledHelpText: 'Aktivieren oder deaktivieren des Git Plugins.\n\
+      Die Seite muss neu geladen werden wenn dieser Wert geändert wird.'
     
   });
 
diff --git a/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/hg.config.js b/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/hg.config.js
index 1c234c9091..d7c6fe0950 100644
--- a/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/hg.config.js
+++ b/scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/hg.config.js
@@ -43,6 +43,7 @@ Sonia.hg.ConfigPanel = Ext.extend(Sonia.config.ConfigForm, {
   useOptimizedBytecodeText: 'Optimized Bytecode (.pyo)',
   configWizardText: 'Start Configuration Wizard',
   configWizardLabelText: 'Start Configuration Wizard',
+  disabledText: 'Disabled',
 
   // helpText
   hgBinaryHelpText: 'Location of Mercurial binary.',
@@ -50,6 +51,8 @@ Sonia.hg.ConfigPanel = Ext.extend(Sonia.config.ConfigForm, {
   pythonPathHelpText: 'Python Module Search Path (PYTHONPATH).',
   repositoryDirectoryHelpText: 'Location of the Mercurial repositories.',
   useOptimizedBytecodeHelpText: 'Use the Python "-O" switch.',
+  disabledHelpText: 'Enable or disable the Mercurial plugin. \n\
+                    Note you have to reload the page, after changing this value.',
 
   initComponent: function(){
 
@@ -84,6 +87,12 @@ Sonia.hg.ConfigPanel = Ext.extend(Sonia.config.ConfigForm, {
         fieldLabel: this.useOptimizedBytecodeText,
         inputValue: 'true',
         helpText: this.useOptimizedBytecodeHelpText
+      },{
+        xtype: 'checkbox',
+        name: 'disabled',
+        fieldLabel: this.disabledText,
+        inputValue: 'true',
+        helpText: this.disabledHelpText        
       },{
         xtype: 'button',
         text: this.configWizardText,
@@ -182,14 +191,16 @@ if ( i18n != null && i18n.country == 'de' ){
     autoConfigLabelText: 'Automatische Einstellung',
     configWizardText: 'Konfigurations-Assistenten starten',
     configWizardLabelText: 'Konfigurations-Assistent',
+    disabledText: 'Deaktivieren',
 
     // helpText
     hgBinaryHelpText: 'Pfad zum "hg" Befehl.',
     pythonBinaryHelpText: 'Pfad zum "python" Befehl.',
     pythonPathHelpText: 'Python Modul Suchpfad (PYTHONPATH).',
     repositoryDirectoryHelpText: 'Verzeichnis der Mercurial-Repositories.',
-    useOptimizedBytecodeHelpText: 'Optimierten Bytecode verwenden (python -O).'
-
+    useOptimizedBytecodeHelpText: 'Optimierten Bytecode verwenden (python -O).',
+    disabledHelpText: 'Aktivieren oder deaktivieren des Mercurial Plugins.\n\
+      Die Seite muss neu geladen werden wenn dieser Wert geändert wird.'
   });
 
 }
diff --git a/scm-plugins/scm-svn-plugin/src/main/resources/sonia/scm/svn.config.js b/scm-plugins/scm-svn-plugin/src/main/resources/sonia/scm/svn.config.js
index a89beca241..f4bb8a556a 100644
--- a/scm-plugins/scm-svn-plugin/src/main/resources/sonia/scm/svn.config.js
+++ b/scm-plugins/scm-svn-plugin/src/main/resources/sonia/scm/svn.config.js
@@ -40,9 +40,12 @@ Sonia.svn.ConfigPanel = Ext.extend(Sonia.config.SimpleConfigForm, {
   pre14CompatibleText: 'Pre 1.4 Compatible',
   pre15CompatibleText: 'Pre 1.5 Compatible',
   pre16CompatibleText: 'Pre 1.6 Compatible',
+  disabledText: 'Disabled',
 
   // helpTexts
   repositoryDirectoryHelpText: 'Location of the Suberversion repositories.',
+  disabledHelpText: 'Enable or disable the Subversion plugin.\n\
+                    Note you have to reload the page, after changing this value.',
 
   initComponent: function(){
 
@@ -76,6 +79,12 @@ Sonia.svn.ConfigPanel = Ext.extend(Sonia.config.SimpleConfigForm, {
           inputValue: 'PRE16',
           name: 'compatibility'
         }]
+      },{
+        xtype: 'checkbox',
+        name: 'disabled',
+        fieldLabel: this.disabledText,
+        inputValue: 'true',
+        helpText: this.disabledHelpText
       }]
     }
 
@@ -100,10 +109,12 @@ if ( i18n != null && i18n.country == 'de' ){
     pre14CompatibleText: 'Mit Versionen vor 1.4 kompatibel',
     pre15CompatibleText: 'Mit Versionen vor 1.5 kompatibel',
     pre16CompatibleText: 'Mit Versionen vor 1.6 kompatibel',
+    disabledText: 'Deaktivieren',
 
     // helpTexts
-    repositoryDirectoryHelpText: 'Verzeichnis der Subversion-Repositories.'
-
+    repositoryDirectoryHelpText: 'Verzeichnis der Subversion-Repositories.',
+    disabledHelpText: 'Aktivieren oder deaktivieren des Subversion Plugins.\n\
+      Die Seite muss neu geladen werden wenn dieser Wert geändert wird.'
   });
 
 }
diff --git a/scm-webapp/src/main/webapp/resources/js/i18n/de.js b/scm-webapp/src/main/webapp/resources/js/i18n/de.js
index 211ab2c7eb..aff9f25c9d 100644
--- a/scm-webapp/src/main/webapp/resources/js/i18n/de.js
+++ b/scm-webapp/src/main/webapp/resources/js/i18n/de.js
@@ -151,7 +151,8 @@ if ( Sonia.repository.Grid ){
     colCreationDateText: 'Erstellungsdatum',
     colUrlText: 'Url',
     emptyText: 'Es wurde kein Repository konfiguriert',
-    formTitleText: 'Repository'
+    formTitleText: 'Repository',
+    unknownType: 'Unbekannt'
   });
 
 }
diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.grid.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.grid.js
index f4d8607148..0eb2932cf8 100644
--- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.grid.js
+++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.grid.js
@@ -38,6 +38,7 @@ Sonia.repository.Grid = Ext.extend(Sonia.rest.Grid, {
   colUrlText: 'Url',
   emptyText: 'No repository is configured',
   formTitleText: 'Repository Form',
+  unknownType: 'Unknown',
   
   searchValue: null,
   typeFilter: null,
@@ -324,9 +325,14 @@ Sonia.repository.Grid = Ext.extend(Sonia.rest.Grid, {
   },
 
   renderRepositoryType: function(repositoryType){
-    return repositoryTypeStore.queryBy(function(rec){
+    var displayName = this.unknownType;
+    var rec = repositoryTypeStore.queryBy(function(rec){
       return rec.data.name == repositoryType;
-    }).itemAt(0).data.displayName;
+    }).itemAt(0);
+    if ( rec ){
+      displayName = rec.get('displayName');
+    }
+    return displayName;
   }
   
 });