diff --git a/manage.py b/manage.py
index 502d97aaf9..ea548a065f 100755
--- a/manage.py
+++ b/manage.py
@@ -8,12 +8,13 @@
 
 from redash import settings, models, __version__
 from redash.wsgi import app
-from redash.cli import users, database, data_sources, organization
+from redash.cli import users, groups, database, data_sources, organization
 from redash.monitor import get_status
 
 manager = Manager(app)
 manager.add_command("database", database.manager)
 manager.add_command("users", users.manager)
+manager.add_command("groups", groups.manager)
 manager.add_command("ds", data_sources.manager)
 manager.add_command("org", organization.manager)
 
diff --git a/redash/cli/groups.py b/redash/cli/groups.py
new file mode 100644
index 0000000000..ab41a91601
--- /dev/null
+++ b/redash/cli/groups.py
@@ -0,0 +1,50 @@
+from flask_script import Manager, prompt_pass
+from redash import models
+
+manager = Manager(help="Groups management commands. This commands assume single organization operation.")
+
+@manager.option('name', help="Group's name")
+@manager.option('--permissions', dest='permissions', default=None, help="Comma seperated list of permissions ('create_dashboard', 'create_query', 'edit_dashboard', 'edit_query', 'view_query', 'view_source', 'execute_query', 'list_users', 'schedule_query', 'list_dashboards', 'list_alerts', 'list_data_sources') (leave blank for default).")
+def create(name, permissions=None):
+    print "Creating group (%s)..." % (name)
+
+    org = models.Organization.get_by_slug('default')
+
+    permissions = extract_permissions_string(permissions)
+
+    print "permissions: [%s]" % ",".join(permissions)
+
+    try:
+        models.Group.create(name=name, org=org, permissions=permissions)
+    except Exception, e:
+        print "Failed create group: %s" % e.message  
+
+@manager.option('id', help="Group's id")
+@manager.option('--permissions', dest='permissions', default=None, help="Comma seperated list of permissions ('create_dashboard', 'create_query', 'edit_dashboard', 'edit_query', 'view_query', 'view_source', 'execute_query', 'list_users', 'schedule_query', 'list_dashboards', 'list_alerts', 'list_data_sources') (leave blank for default).")
+def change_permissions(id, permissions=None):
+    print "Change permissions of group %s ..." % id
+
+    try:
+        group = models.Group.get_by_id(id)
+    except models.Group.DoesNotExist:
+        print "User [%s] not found." % id
+        return
+
+    permissions = extract_permissions_string(permissions)    
+    print "current permissions [%s] will be modify to [%s]" % (",".join(group.permissions), ",".join(permissions))
+
+    group.permissions = permissions
+
+    try:
+        group.save()
+    except Exception, e:
+        print "Failed change permission: %s" % e.message  
+
+
+def extract_permissions_string(permissions):
+    if permissions is None:
+        permissions = models.Group.DEFAULT_PERMISSIONS
+    else:
+        permissions = permissions.split(',')
+        permissions = [p.strip() for p in permissions]
+    return permissions
\ No newline at end of file