diff --git a/core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java b/core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java
index 4f993c4..aaac493 100644
--- a/core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java
+++ b/core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java
@@ -15,13 +15,10 @@
  */
 package org.onlab.onos.cluster.impl;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.slf4j.LoggerFactory.getLogger;
-import static org.onlab.metrics.MetricsUtil.*;
-
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-
+import com.codahale.metrics.Timer;
+import com.codahale.metrics.Timer.Context;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
@@ -50,8 +47,18 @@
 import org.onlab.onos.net.MastershipRole;
 import org.slf4j.Logger;
 
-import com.codahale.metrics.Timer;
-import com.codahale.metrics.Timer.Context;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.collect.Lists.newArrayList;
+import static org.onlab.metrics.MetricsUtil.startTimer;
+import static org.onlab.metrics.MetricsUtil.stopTimer;
+import static org.onlab.onos.net.MastershipRole.MASTER;
+import static org.slf4j.LoggerFactory.getLogger;
 
 @Component(immediate = true)
 @Service
@@ -198,6 +205,71 @@
         return metricsService;
     }
 
+    @Override
+    public void balanceRoles() {
+        List<ControllerNode> nodes = newArrayList(clusterService.getNodes());
+        Multimap<ControllerNode, DeviceId> controllerDevices = HashMultimap.create();
+        int deviceCount = 0;
+
+        // Create buckets reflecting current ownership.
+        for (ControllerNode node : nodes) {
+            Set<DeviceId> devicesOf = getDevicesOf(node.id());
+            deviceCount += devicesOf.size();
+            controllerDevices.putAll(node, devicesOf);
+            log.info("Node {} has {} devices.", node.id(), devicesOf.size());
+        }
+
+        int rounds = nodes.size();
+        for (int i = 0; i < rounds; i++) {
+            // Iterate over the buckets and find the smallest and the largest.
+            ControllerNode smallest = findBucket(true, nodes, controllerDevices);
+            ControllerNode largest = findBucket(false, nodes, controllerDevices);
+            balanceBuckets(smallest, largest, controllerDevices, deviceCount);
+        }
+    }
+
+    private ControllerNode findBucket(boolean min, Collection<ControllerNode> nodes,
+                                      Multimap<ControllerNode, DeviceId> controllerDevices) {
+        int xSize = min ? Integer.MAX_VALUE : -1;
+        ControllerNode xNode = null;
+        for (ControllerNode node : nodes) {
+            int size = controllerDevices.get(node).size();
+            if ((min && size < xSize) || (!min && size > xSize)) {
+                xSize = size;
+                xNode = node;
+            }
+        }
+        return xNode;
+    }
+
+    private void balanceBuckets(ControllerNode smallest, ControllerNode largest,
+                                Multimap<ControllerNode, DeviceId> controllerDevices,
+                                int deviceCount) {
+        Collection<DeviceId> minBucket = controllerDevices.get(smallest);
+        Collection<DeviceId> maxBucket = controllerDevices.get(largest);
+        int bucketCount = controllerDevices.keySet().size();
+
+        int delta = (maxBucket.size() - minBucket.size()) / 2;
+        delta = Math.min(deviceCount / bucketCount, delta);
+
+        if (delta > 0) {
+            log.info("Attempting to move {} nodes from {} to {}...", delta,
+                     largest.id(), smallest.id());
+
+            int i = 0;
+            Iterator<DeviceId> it = maxBucket.iterator();
+            while (it.hasNext() && i < delta) {
+                DeviceId deviceId = it.next();
+                log.info("Setting {} as the master for {}", smallest.id(), deviceId);
+                setRole(smallest.id(), deviceId, MASTER);
+                controllerDevices.put(smallest, deviceId);
+                it.remove();
+                i++;
+            }
+        }
+    }
+
+
     // Posts the specified event to the local event dispatcher.
     private void post(MastershipEvent event) {
         if (event != null && eventDispatcher != null) {