diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListGroupsSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListGroupsSubCommand.java
new file mode 100644
index 0000000000..b6e18e8e24
--- /dev/null
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListGroupsSubCommand.java
@@ -0,0 +1,74 @@
+/**
+ * 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.client.ScmClientSession;
+import sonia.scm.group.Group;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+@Command("list-groups")
+public class ListGroupsSubCommand extends TemplateSubCommand
+{
+
+  /** Field description */
+  public static final String TEMPLATE = "/sonia/resources/list-groups.ftl";
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   */
+  @Override
+  protected void run()
+  {
+    ScmClientSession session = createSession();
+    List<Group> groups = session.getGroupHandler().getAll();
+    Map<String, Object> env = new HashMap<String, Object>();
+
+    env.put("groups", groups);
+    renderTemplate(env, TEMPLATE);
+  }
+}
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 d75613a14f..811db6d080 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
@@ -47,4 +47,7 @@ sonia.scm.cli.cmd.ListUsersSubCommand
 sonia.scm.cli.cmd.GetUserSubCommand
 sonia.scm.cli.cmd.CreateUserSubCommand
 sonia.scm.cli.cmd.DeleteUserSubCommand
-sonia.scm.cli.cmd.ModifyUserSubCommand
\ No newline at end of file
+sonia.scm.cli.cmd.ModifyUserSubCommand
+
+# group
+sonia.scm.cli.cmd.ListGroupsSubCommand
diff --git a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/list-groups.ftl b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/list-groups.ftl
new file mode 100644
index 0000000000..adcb05277d
--- /dev/null
+++ b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/list-groups.ftl
@@ -0,0 +1,13 @@
+<#list groups as group>
+Name:           ${group.name}
+Type:           ${group.type}
+Description:    ${group.description}
+Creation-Date:  ${group.creationDate!""?string}
+Last-Modified:  ${group.lastModified!""?string}
+Members:
+<#if group.members??>
+<#list group.members as member>
+  ${member}
+</#list>
+</#if>
+</#list>
\ No newline at end of file