diff --git a/sql/updates/auth/2013_09_02_05_auth_misc.sql b/sql/updates/auth/2013_09_02_05_auth_misc.sql
new file mode 100644
index 0000000000..8d71ab530d
--- /dev/null
+++ b/sql/updates/auth/2013_09_02_05_auth_misc.sql
@@ -0,0 +1,23 @@
+/* cs_gm.cpp */
+
+SET @id = 371;
+
+-- Add new permissions
+DELETE FROM `rbac_permissions` WHERE `id` BETWEEN @id AND @id+5;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(@id+0, 'gm'),
+(@id+1, 'gm chat'),
+(@id+2, 'gm fly'),
+(@id+3, 'gm ingame'),
+(@id+4, 'gm list'),
+(@id+5, 'gm visible');
+
+-- Add permissions to "corresponding Commands Role"
+DELETE FROM `rbac_role_permissions` WHERE `permissionId` BETWEEN @id AND @id+5;
+INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
+(2, @id+0),
+(2, @id+1),
+(4, @id+2),
+(2, @id+3),
+(4, @id+4),
+(2, @id+5);
diff --git a/sql/updates/world/2013_09_02_06_world_command.sql b/sql/updates/world/2013_09_02_06_world_command.sql
new file mode 100644
index 0000000000..fe033e544e
--- /dev/null
+++ b/sql/updates/world/2013_09_02_06_world_command.sql
@@ -0,0 +1,11 @@
+/* cs_gm.cpp */
+
+SET @id = 371;
+
+-- Update command table with new RBAC permissions
+UPDATE `command` SET `permission` = @id+0 WHERE `name` = 'gm';
+UPDATE `command` SET `permission` = @id+1 WHERE `name` = 'gm chat';
+UPDATE `command` SET `permission` = @id+2 WHERE `name` = 'gm fly';
+UPDATE `command` SET `permission` = @id+3 WHERE `name` = 'gm ingame';
+UPDATE `command` SET `permission` = @id+4 WHERE `name` = 'gm list';
+UPDATE `command` SET `permission` = @id+5 WHERE `name` = 'gm visible';
diff --git a/src/server/game/Accounts/RBAC.h b/src/server/game/Accounts/RBAC.h
index 2f82edecf4..5bcd522b3b 100644
--- a/src/server/game/Accounts/RBAC.h
+++ b/src/server/game/Accounts/RBAC.h
@@ -248,6 +248,13 @@ enum RBACPermissions
     RBAC_PERM_COMMAND_EVENT_ACTIVELIST                       = 368,
     RBAC_PERM_COMMAND_EVENT_START                            = 369,
     RBAC_PERM_COMMAND_EVENT_STOP                             = 370,
+    RBAC_PERM_COMMAND_GM                                     = 371,
+    RBAC_PERM_COMMAND_GM_CHAT                                = 372,
+    RBAC_PERM_COMMAND_GM_FLY                                 = 373,
+    RBAC_PERM_COMMAND_GM_INGAME                              = 374,
+    RBAC_PERM_COMMAND_GM_LIST                                = 375,
+    RBAC_PERM_COMMAND_GM_VISIBLE                             = 376,
+
     // custom permissions 1000+
     RBAC_PERM_MAX
 };
diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp
index 0eb5bc1ef6..24eff29e27 100644
--- a/src/server/scripts/Commands/cs_gm.cpp
+++ b/src/server/scripts/Commands/cs_gm.cpp
@@ -40,18 +40,18 @@ public:
     {
         static ChatCommand gmCommandTable[] =
         {
-            { "chat",           RBAC_PERM_MODERATOR_COMMANDS,      false, &HandleGMChatCommand,              "", NULL },
-            { "fly",            RBAC_PERM_ADMINISTRATOR_COMMANDS,  false, &HandleGMFlyCommand,               "", NULL },
-            { "ingame",         RBAC_PERM_PLAYER_COMMANDS,         true,  &HandleGMListIngameCommand,        "", NULL },
-            { "list",           RBAC_PERM_ADMINISTRATOR_COMMANDS,  true,  &HandleGMListFullCommand,          "", NULL },
-            { "visible",        RBAC_PERM_MODERATOR_COMMANDS,      false, &HandleGMVisibleCommand,           "", NULL },
-            { "",               RBAC_PERM_MODERATOR_COMMANDS,      false, &HandleGMCommand,                  "", NULL },
-            { NULL,             0,                  false, NULL,                              "", NULL }
+            { "chat",    RBAC_PERM_COMMAND_GM_CHAT,    false, &HandleGMChatCommand,       "", NULL },
+            { "fly",     RBAC_PERM_COMMAND_GM_FLY,     false, &HandleGMFlyCommand,        "", NULL },
+            { "ingame",  RBAC_PERM_COMMAND_GM_INGAME,   true, &HandleGMListIngameCommand, "", NULL },
+            { "list",    RBAC_PERM_COMMAND_GM_LIST,     true, &HandleGMListFullCommand,   "", NULL },
+            { "visible", RBAC_PERM_COMMAND_GM_VISIBLE, false, &HandleGMVisibleCommand,    "", NULL },
+            { "",        RBAC_PERM_COMMAND_GM,         false, &HandleGMCommand,           "", NULL },
+            { NULL,      0,                            false, NULL,                       "", NULL }
         };
         static ChatCommand commandTable[] =
         {
-            { "gm",             RBAC_PERM_MODERATOR_COMMANDS,      false, NULL,                     "", gmCommandTable },
-            { NULL,             0,                  false, NULL,                               "", NULL }
+            { "gm", RBAC_PERM_COMMAND_GM, false, NULL, "", gmCommandTable },
+            { NULL, 0,                    false, NULL, "", NULL }
         };
         return commandTable;
     }