diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/ListRepositoriesSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/ListRepositoriesSubCommand.java
index 3cd459f762..2c395825d5 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/ListRepositoriesSubCommand.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/ListRepositoriesSubCommand.java
@@ -33,6 +33,15 @@
 
 package sonia.scm.cli;
 
+//~--- non-JDK imports --------------------------------------------------------
+
+import sonia.scm.client.ScmClientSession;
+import sonia.scm.repository.Repository;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.util.List;
+
 /**
  *
  * @author Sebastian Sdorra
@@ -48,6 +57,12 @@ public class ListRepositoriesSubCommand extends SubCommand
   @Override
   protected void run()
   {
-    output.println( "list-repositoies" );
+    ScmClientSession session = createSession();
+    List<Repository> repositories = session.getRepositoryHandler().getAll();
+
+    for (Repository r : repositories)
+    {
+      output.println(r);
+    }
   }
 }
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommand.java
index b1206b6452..24d3d8315b 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommand.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/SubCommand.java
@@ -198,9 +198,6 @@ public abstract class SubCommand
   /** Field description */
   protected PrintWriter output;
 
-  /** Field description */
-  protected ScmClientSession session;
-
   /** Field description */
   @Option(
     name = "--help",
@@ -208,4 +205,7 @@ public abstract class SubCommand
     aliases = { "-h" }
   )
   private boolean help = false;
+
+  /** Field description */
+  private ScmClientSession session;
 }