diff --git a/scm-webapp/src/main/java/sonia/scm/ScmContextListener.java b/scm-webapp/src/main/java/sonia/scm/ScmContextListener.java
index c2579095f5..ee60f80d77 100644
--- a/scm-webapp/src/main/java/sonia/scm/ScmContextListener.java
+++ b/scm-webapp/src/main/java/sonia/scm/ScmContextListener.java
@@ -40,6 +40,7 @@ import com.google.inject.Injector;
 import com.google.inject.Module;
 import com.google.inject.servlet.GuiceServletContextListener;
 
+import sonia.scm.group.GroupManager;
 import sonia.scm.plugin.DefaultPluginLoader;
 import sonia.scm.plugin.PluginLoader;
 import sonia.scm.repository.RepositoryManager;
@@ -80,6 +81,9 @@ public class ScmContextListener extends GuiceServletContextListener
       // close Authenticator
       IOUtil.close(injector.getInstance(AuthenticationManager.class));
 
+      // close GroupManager
+      IOUtil.close(injector.getInstance(GroupManager.class));
+
       // close UserManager
       IOUtil.close(injector.getInstance(UserManager.class));
 
@@ -126,6 +130,9 @@ public class ScmContextListener extends GuiceServletContextListener
     // init UserManager
     injector.getInstance(UserManager.class).init(context);
 
+    // init GroupManager
+    injector.getInstance(GroupManager.class).init(context);
+
     // init Authenticator
     injector.getInstance(AuthenticationManager.class).init(context);
 
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/GroupResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/GroupResource.java
new file mode 100644
index 0000000000..38c21a4ca6
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/GroupResource.java
@@ -0,0 +1,179 @@
+/**
+ * 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.api.rest.resources;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+
+import sonia.scm.group.Group;
+import sonia.scm.group.GroupManager;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.util.Collection;
+
+import javax.ws.rs.Path;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+@Path("groups")
+@Singleton
+public class GroupResource extends AbstractResource<Group>
+{
+
+  /** Field description */
+  public static final String PATH_PART = "groups";
+
+  //~--- constructors ---------------------------------------------------------
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param groupManager
+   */
+  @Inject
+  public GroupResource(GroupManager groupManager)
+  {
+    this.groupManager = groupManager;
+  }
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param group
+   *
+   * @throws Exception
+   */
+  @Override
+  protected void addItem(Group group) throws Exception
+  {
+    groupManager.create(group);
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param group
+   *
+   * @throws Exception
+   */
+  @Override
+  protected void removeItem(Group group) throws Exception
+  {
+    groupManager.delete(group);
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param name
+   * @param group
+   *
+   * @throws Exception
+   */
+  @Override
+  protected void updateItem(String name, Group group) throws Exception
+  {
+    groupManager.modify(group);
+  }
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  protected Collection<Group> getAllItems()
+  {
+    return groupManager.getAll();
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param group
+   *
+   * @return
+   */
+  @Override
+  protected String getId(Group group)
+  {
+    return group.getName();
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param name
+   *
+   * @return
+   */
+  @Override
+  protected Group getItem(String name)
+  {
+    return groupManager.get(name);
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  protected String getPathPart()
+  {
+    return PATH_PART;
+  }
+
+  //~--- fields ---------------------------------------------------------------
+
+  /** Field description */
+  private GroupManager groupManager;
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/group/xml/XmlGroupDatabase.java b/scm-webapp/src/main/java/sonia/scm/group/xml/XmlGroupDatabase.java
index 1dfacf361e..de84c43649 100644
--- a/scm-webapp/src/main/java/sonia/scm/group/xml/XmlGroupDatabase.java
+++ b/scm-webapp/src/main/java/sonia/scm/group/xml/XmlGroupDatabase.java
@@ -44,13 +44,18 @@ import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 /**
  *
  * @author Sebastian Sdorra
  */
+@XmlRootElement(name = "group-db")
+@XmlAccessorType(XmlAccessType.FIELD)
 public class XmlGroupDatabase
 {