diff --git a/server-spi/src/main/java/org/keycloak/migration/MigrationModel.java b/server-spi/src/main/java/org/keycloak/migration/MigrationModel.java
index 6196a2903c..270c3a5569 100755
--- a/server-spi/src/main/java/org/keycloak/migration/MigrationModel.java
+++ b/server-spi/src/main/java/org/keycloak/migration/MigrationModel.java
@@ -26,7 +26,7 @@ public interface MigrationModel {
     /**
      * Must have the form of major.minor.micro as the version is parsed and numbers are compared
      */
-    String LATEST_VERSION = "1.9.2";
+    String LATEST_VERSION = "2.0.0";
 
     String getStoredVersion();
     void setStoredVersion(String version);
diff --git a/server-spi/src/main/java/org/keycloak/migration/MigrationModelManager.java b/server-spi/src/main/java/org/keycloak/migration/MigrationModelManager.java
index 7a29804b9b..837064dfc3 100755
--- a/server-spi/src/main/java/org/keycloak/migration/MigrationModelManager.java
+++ b/server-spi/src/main/java/org/keycloak/migration/MigrationModelManager.java
@@ -26,6 +26,7 @@ import org.keycloak.migration.migrators.MigrateTo1_7_0;
 import org.keycloak.migration.migrators.MigrateTo1_8_0;
 import org.keycloak.migration.migrators.MigrateTo1_9_0;
 import org.keycloak.migration.migrators.MigrateTo1_9_2;
+import org.keycloak.migration.migrators.MigrateTo2_0_0;
 import org.keycloak.migration.migrators.MigrationTo1_2_0_CR1;
 import org.keycloak.models.KeycloakSession;
 
@@ -99,6 +100,12 @@ public class MigrationModelManager {
             }
             new MigrateTo1_9_2().migrate(session);
         }
+        if (stored == null || stored.lessThan(MigrateTo2_0_0.VERSION)) {
+            if (stored != null) {
+                logger.debug("Migrating older model to 2.0.0 updates");
+            }
+            new MigrateTo2_0_0().migrate(session);
+        }
 
         model.setStoredVersion(MigrationModel.LATEST_VERSION);
     }
diff --git a/server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo2_0_0.java b/server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo2_0_0.java
new file mode 100644
index 0000000000..2b3898c003
--- /dev/null
+++ b/server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo2_0_0.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2016 Red Hat, Inc. and/or its affiliates
+ * and other contributors as indicated by the @author tags.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.keycloak.migration.migrators;
+
+import org.keycloak.Config;
+import org.keycloak.migration.ModelVersion;
+import org.keycloak.models.AdminRoles;
+import org.keycloak.models.ClientModel;
+import org.keycloak.models.Constants;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.RoleModel;
+import org.keycloak.models.utils.KeycloakModelUtils;
+
+public class MigrateTo2_0_0 {
+
+    public static final ModelVersion VERSION = new ModelVersion("2.0.0");
+
+    public void migrate(KeycloakSession session) {
+        for (RealmModel realm : session.realms().getRealms()) {
+            migrateAuthorizationServices(realm);
+        }
+    }
+
+    private void migrateAuthorizationServices(RealmModel realm) {
+        KeycloakModelUtils.setupAuthorizationServices(realm);
+
+        ClientModel client = realm.getMasterAdminClient();
+
+        if (client.getRole(AdminRoles.MANAGE_AUTHORIZATION) == null) {
+            RoleModel role = client.addRole(AdminRoles.MANAGE_AUTHORIZATION);
+            role.setDescription("${role_" + AdminRoles.MANAGE_AUTHORIZATION + "}");
+            role.setScopeParamRequired(false);
+
+            client.getRealm().getRole(AdminRoles.ADMIN).addCompositeRole(role);
+        }
+
+        if (!realm.getName().equals(Config.getAdminRealm())) {
+            client = realm.getClientByClientId(Constants.REALM_MANAGEMENT_CLIENT_ID);
+
+            if (client.getRole(AdminRoles.MANAGE_AUTHORIZATION) == null) {
+                RoleModel role = client.addRole(AdminRoles.MANAGE_AUTHORIZATION);
+                role.setDescription("${role_" + AdminRoles.MANAGE_AUTHORIZATION + "}");
+                role.setScopeParamRequired(false);
+
+                client.getRole(AdminRoles.REALM_ADMIN).addCompositeRole(role);
+            }
+        }
+    }
+
+}
diff --git a/server-spi/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java b/server-spi/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java
index e0dc211448..819c0db674 100755
--- a/server-spi/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java
+++ b/server-spi/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java
@@ -642,5 +642,14 @@ public final class KeycloakModelUtils {
         return null;
     }
 
-
+    public static void setupAuthorizationServices(RealmModel realm) {
+        for (String roleName : Constants.AUTHZ_DEFAULT_AUTHORIZATION_ROLES) {
+            if (realm.getRole(roleName) == null) {
+                RoleModel role = realm.addRole(roleName);
+                role.setDescription("${role_" + roleName + "}");
+                role.setScopeParamRequired(false);
+                realm.addDefaultRole(roleName);
+            }
+        }
+    }
 }
diff --git a/services/src/main/java/org/keycloak/services/managers/RealmManager.java b/services/src/main/java/org/keycloak/services/managers/RealmManager.java
index 3926447c99..b38e245f7a 100755
--- a/services/src/main/java/org/keycloak/services/managers/RealmManager.java
+++ b/services/src/main/java/org/keycloak/services/managers/RealmManager.java
@@ -585,13 +585,6 @@ public class RealmManager implements RealmImporter {
     }
 
     private void setupAuthorizationServices(RealmModel realm) {
-        for (String roleName : Constants.AUTHZ_DEFAULT_AUTHORIZATION_ROLES) {
-            if (realm.getRole(roleName) == null) {
-                RoleModel role = realm.addRole(roleName);
-                role.setDescription("${role_" + roleName + "}");
-                role.setScopeParamRequired(false);
-                realm.addDefaultRole(roleName);
-            }
-        }
+        KeycloakModelUtils.setupAuthorizationServices(realm);
     }
 }