diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/DeleteConfigSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/DeleteConfigSubCommand.java
new file mode 100644
index 0000000000..e89a1aef86
--- /dev/null
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/DeleteConfigSubCommand.java
@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of SCM-Manager; nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
+ *    software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.cli.cmd;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import sonia.scm.cli.config.ScmClientConfig;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+@Command("delete-config")
+public class DeleteConfigSubCommand extends SubCommand
+{
+
+  /**
+   * Method description
+   *
+   */
+  @Override
+  protected void run()
+  {
+    ScmClientConfig.getInstance().delete();
+  }
+}
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/ScmClientConfig.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/ScmClientConfig.java
index 63e861e209..9edb2b382a 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/ScmClientConfig.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/ScmClientConfig.java
@@ -118,6 +118,15 @@ public class ScmClientConfig
     return config;
   }
 
+  /**
+   * Method description
+   *
+   */
+  public void delete()
+  {
+    fileHandler.delete();
+  }
+
   /**
    * Method description
    *
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/ScmClientConfigFileHandler.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/ScmClientConfigFileHandler.java
index d615a64b79..5cc2c46978 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/ScmClientConfigFileHandler.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/config/ScmClientConfigFileHandler.java
@@ -101,9 +101,7 @@ public class ScmClientConfigFileHandler
    */
   public ScmClientConfigFileHandler()
   {
-    Preferences prefs =
-      Preferences.userNodeForPackage(ScmClientConfigFileHandler.class);
-
+    prefs = Preferences.userNodeForPackage(ScmClientConfigFileHandler.class);
     key = prefs.get(PREF_SECRET_KEY, null);
 
     if (Util.isEmpty(key))
@@ -125,6 +123,22 @@ public class ScmClientConfigFileHandler
 
   //~--- methods --------------------------------------------------------------
 
+  /**
+   * Method description
+   *
+   */
+  public void delete()
+  {
+    File configFile = getConfigFile();
+
+    if (configFile.exists() &&!configFile.delete())
+    {
+      throw new ScmConfigException("could not delete config file");
+    }
+
+    prefs.remove(PREF_SECRET_KEY);
+  }
+
   /**
    * Method description
    *
@@ -286,4 +300,7 @@ public class ScmClientConfigFileHandler
 
   /** Field description */
   private String key;
+
+  /** Field description */
+  private Preferences prefs;
 }
diff --git a/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.cmd.SubCommand b/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.cmd.SubCommand
index dd24f585a2..99987bd555 100644
--- a/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.cmd.SubCommand
+++ b/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.cmd.SubCommand
@@ -28,4 +28,5 @@
 # 
 
 sonia.scm.cli.cmd.ListRepositoriesSubCommand
-sonia.scm.cli.cmd.StoreConfigSubCommand
\ No newline at end of file
+sonia.scm.cli.cmd.StoreConfigSubCommand
+sonia.scm.cli.cmd.DeleteConfigSubCommand
\ No newline at end of file