diff --git a/core/Command/Group/AddUser.php b/core/Command/Group/AddUser.php
new file mode 100644
index 0000000000..23aa193fbc
--- /dev/null
+++ b/core/Command/Group/AddUser.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Robin Appelman <robin@icewind.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Core\Command\Group;
+
+use OC\Core\Command\Base;
+use OCP\IGroupManager;
+use OCP\IUserManager;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class AddUser extends Base {
+	/** @var IUserManager */
+	protected $userManager;
+	/** @var IGroupManager */
+	protected $groupManager;
+
+	/**
+	 * @param IUserManager $userManager
+	 * @param IGroupManager $groupManager
+	 */
+	public function __construct(IUserManager $userManager, IGroupManager $groupManager) {
+		$this->userManager = $userManager;
+		$this->groupManager = $groupManager;
+		parent::__construct();
+	}
+
+	protected function configure() {
+		$this
+			->setName('group:adduser')
+			->setDescription('add a user to a group')
+			->addArgument(
+				'group',
+				InputArgument::REQUIRED,
+				'group to add the user to'
+			)->addArgument(
+				'user',
+				InputArgument::REQUIRED,
+				'user to add to the group'
+			);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$group = $this->groupManager->get($input->getArgument('group'));
+		if (is_null($group)) {
+			$output->writeln('<error>group not found</error>');
+			return 1;
+		}
+		$user = $this->userManager->get($input->getArgument('user'));
+		if (is_null($user)) {
+			$output->writeln('<error>user not found</error>');
+			return 1;
+		}
+		$group->addUser($user);
+	}
+}
diff --git a/core/Command/Group/RemoveUser.php b/core/Command/Group/RemoveUser.php
new file mode 100644
index 0000000000..f579468a74
--- /dev/null
+++ b/core/Command/Group/RemoveUser.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Robin Appelman <robin@icewind.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Core\Command\Group;
+
+use OC\Core\Command\Base;
+use OCP\IGroupManager;
+use OCP\IUserManager;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class RemoveUser extends Base {
+	/** @var IUserManager */
+	protected $userManager;
+	/** @var IGroupManager */
+	protected $groupManager;
+
+	/**
+	 * @param IUserManager $userManager
+	 * @param IGroupManager $groupManager
+	 */
+	public function __construct(IUserManager $userManager, IGroupManager $groupManager) {
+		$this->userManager = $userManager;
+		$this->groupManager = $groupManager;
+		parent::__construct();
+	}
+
+	protected function configure() {
+		$this
+			->setName('group:removeuser')
+			->setDescription('remove a user from a group')
+			->addArgument(
+				'group',
+				InputArgument::REQUIRED,
+				'group to remove the user from'
+			)->addArgument(
+				'user',
+				InputArgument::REQUIRED,
+				'user to remove from the group'
+			);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$group = $this->groupManager->get($input->getArgument('group'));
+		if (is_null($group)) {
+			$output->writeln('<error>group not found</error>');
+			return 1;
+		}
+		$user = $this->userManager->get($input->getArgument('user'));
+		if (is_null($user)) {
+			$output->writeln('<error>user not found</error>');
+			return 1;
+		}
+		$group->removeUser($user);
+	}
+}
diff --git a/core/register_command.php b/core/register_command.php
index 390fb8cdff..7fc2d969ad 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -140,6 +140,8 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
 	$application->add(new OC\Core\Command\User\ListCommand(\OC::$server->getUserManager()));
 
 	$application->add(new OC\Core\Command\Group\ListCommand(\OC::$server->getGroupManager()));
+	$application->add(new OC\Core\Command\Group\AddUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
+	$application->add(new OC\Core\Command\Group\RemoveUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
 
 	$application->add(new OC\Core\Command\Security\ListCertificates(\OC::$server->getCertificateManager(null), \OC::$server->getL10N('core')));
 	$application->add(new OC\Core\Command\Security\ImportCertificate(\OC::$server->getCertificateManager(null)));