diff --git a/pkg/cmd/server/kubernetes/master.go b/pkg/cmd/server/kubernetes/master.go
index df30be544754..170adef3b1c1 100644
--- a/pkg/cmd/server/kubernetes/master.go
+++ b/pkg/cmd/server/kubernetes/master.go
@@ -13,6 +13,7 @@ import (
 	minionControllerPkg "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/controller"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/controller"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/master"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/resourcequota"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/service"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
 	kubeutil "github.com/GoogleCloudPlatform/kubernetes/pkg/util"
@@ -126,6 +127,11 @@ func (c *MasterConfig) RunScheduler() {
 	glog.Infof("Started Kubernetes Scheduler")
 }
 
+func (c *MasterConfig) RunResourceQuotaManager() {
+	resourceQuotaManager := resourcequota.NewResourceQuotaManager(c.KubeClient)
+	resourceQuotaManager.Run(10 * time.Second)
+}
+
 func (c *MasterConfig) RunMinionController() {
 	nodeResources := &kapi.NodeResources{
 		Capacity: kapi.ResourceList{
diff --git a/pkg/cmd/server/start.go b/pkg/cmd/server/start.go
index 1cee4dc0d3bc..9529aac09c77 100644
--- a/pkg/cmd/server/start.go
+++ b/pkg/cmd/server/start.go
@@ -579,6 +579,7 @@ func start(cfg *config, args []string) error {
 			kmaster.RunReplicationController()
 			kmaster.RunEndpointController()
 			kmaster.RunMinionController()
+			kmaster.RunResourceQuotaManager()
 
 		} else {
 			proxy := &kubernetes.ProxyConfig{