diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/AddPermissionSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/AddPermissionSubCommand.java
new file mode 100644
index 0000000000..791ed735ab
--- /dev/null
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/AddPermissionSubCommand.java
@@ -0,0 +1,142 @@
+/**
+ * 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 org.kohsuke.args4j.Option;
+
+import sonia.scm.repository.Permission;
+import sonia.scm.repository.PermissionType;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.util.List;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+@Command("add-permission")
+public class AddPermissionSubCommand extends PermissionSubCommand
+{
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public PermissionType getType()
+  {
+    return type;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public boolean isGroup()
+  {
+    return group;
+  }
+
+  //~--- set methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param group
+   */
+  public void setGroup(boolean group)
+  {
+    this.group = group;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param type
+   */
+  public void setType(PermissionType type)
+  {
+    this.type = type;
+  }
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param permissions
+   */
+  @Override
+  protected void modifyPermissions(List<Permission> permissions)
+  {
+    permissions.add(new Permission(name, type, group));
+  }
+
+  //~--- fields ---------------------------------------------------------------
+
+  /** Field description */
+  @Option(
+    name = "--group",
+    usage = "optionPermissionGroup",
+    aliases = { "-g" }
+  )
+  private boolean group = false;
+
+  /** Field description */
+  @Option(
+    name = "--name",
+    usage = "optionPermissionName",
+    required = true,
+    aliases = { "-n" }
+  )
+  private String name;
+
+  /** Field description */
+  @Option(
+    name = "--type",
+    usage = "optionPermissionType",
+    required = true,
+    aliases = { "-t" }
+  )
+  private PermissionType type;
+}
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyRepositorySubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyRepositorySubCommand.java
index 350182ae51..75af2e8bdf 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyRepositorySubCommand.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyRepositorySubCommand.java
@@ -143,6 +143,10 @@ public class ModifyRepositorySubCommand extends TemplateSubCommand
 
   //~--- fields ---------------------------------------------------------------
 
+  /**
+   * TODO: public parameter
+   */
+
   /** Field description */
   @Option(
     name = "--contact",
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/PermissionSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/PermissionSubCommand.java
new file mode 100644
index 0000000000..c9ee7ca869
--- /dev/null
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/PermissionSubCommand.java
@@ -0,0 +1,136 @@
+/**
+ * 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 org.kohsuke.args4j.Argument;
+
+import sonia.scm.cli.I18n;
+import sonia.scm.client.RepositoryClientHandler;
+import sonia.scm.client.ScmClientSession;
+import sonia.scm.repository.Permission;
+import sonia.scm.repository.Repository;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public abstract class PermissionSubCommand extends TemplateSubCommand
+{
+
+  /**
+   * Method description
+   *
+   *
+   * @param permissions
+   */
+  protected abstract void modifyPermissions(List<Permission> permissions);
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public String getId()
+  {
+    return id;
+  }
+
+  //~--- set methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param id
+   */
+  public void setId(String id)
+  {
+    this.id = id;
+  }
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   */
+  @Override
+  protected void run()
+  {
+    ScmClientSession session = createSession();
+    RepositoryClientHandler handler = session.getRepositoryHandler();
+    Repository repository = handler.get(id);
+
+    if (repository != null)
+    {
+      List<Permission> permissions = repository.getPermissions();
+
+      if (permissions == null)
+      {
+        permissions = new ArrayList<Permission>();
+      }
+
+      modifyPermissions(permissions);
+      repository.setPermissions(permissions);
+      handler.modify(repository);
+
+      Map<String, Object> env = new HashMap<String, Object>();
+
+      env.put("repository", repository);
+      renderTemplate(env, GetRepositorySubCommand.TEMPLATE);
+    }
+    else
+    {
+      output.println(i18n.getMessage(I18n.REPOSITORY_NOT_FOUND));
+    }
+  }
+
+  //~--- fields ---------------------------------------------------------------
+
+  /** Field description */
+  @Argument(usage = "optionRepositoryId", required = true)
+  private String id;
+}
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 da556b833a..773150c294 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
@@ -36,4 +36,7 @@ sonia.scm.cli.cmd.CreateRepositorySubCommand
 sonia.scm.cli.cmd.ModifyRepositorySubCommand
 sonia.scm.cli.cmd.GetRepositorySubCommand
 sonia.scm.cli.cmd.ListRepositoriesSubCommand
-sonia.scm.cli.cmd.DeleteRepositorySubCommand
\ No newline at end of file
+sonia.scm.cli.cmd.DeleteRepositorySubCommand
+
+# permissions
+sonia.scm.cli.cmd.AddPermissionSubCommand
\ No newline at end of file
diff --git a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties
index eb28c90ebc..8d329981ab 100644
--- a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties
+++ b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties
@@ -43,6 +43,10 @@ optionRepositoryContact = Repository contact
 optionRepositoryDescription = Repository description
 optionRepositoryPublic = Repository public readable
 
+optionPermissionGroup = Gtoup
+optionPermissionName = Group or user name
+optionPermissionType = Permission type (READ,WRITE or OWNER)
+
 repositoryNotFound = The repository is not available
 
 metaVar_config = configname