diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go
index e2b233e513..19214f35d8 100644
--- a/cmd/kube-apiserver/app/server.go
+++ b/cmd/kube-apiserver/app/server.go
@@ -93,7 +93,7 @@ func Run(s *options.ServerRunOptions) error {
 							ApplyAuthenticationOptions(s.Authentication).
 							ApplyRBACSuperUser(s.Authorization.RBACSuperUser)
 
-	serviceIPRange, apiServerServiceIP, err := genericapiserver.DefaultServiceIPRange(s.GenericServerRunOptions.ServiceClusterIPRange)
+	serviceIPRange, apiServerServiceIP, err := master.DefaultServiceIPRange(s.GenericServerRunOptions.ServiceClusterIPRange)
 	if err != nil {
 		glog.Fatalf("Error determining service IP ranges: %v", err)
 	}
diff --git a/pkg/genericapiserver/BUILD b/pkg/genericapiserver/BUILD
index 4cd42b4912..4f0c41726a 100644
--- a/pkg/genericapiserver/BUILD
+++ b/pkg/genericapiserver/BUILD
@@ -22,9 +22,7 @@ go_library(
         "hooks.go",
         "resource_config.go",
         "resource_encoding_config.go",
-        "reststorage_interfaces.go",
         "serve.go",
-        "services.go",
         "storage_factory.go",
         "tunneler.go",
     ],
diff --git a/pkg/master/master.go b/pkg/master/master.go
index b87eaab204..86949e7980 100644
--- a/pkg/master/master.go
+++ b/pkg/master/master.go
@@ -144,7 +144,7 @@ type completedConfig struct {
 func (c *Config) Complete() completedConfig {
 	c.GenericConfig.Complete()
 
-	serviceIPRange, apiServerServiceIP, err := genericapiserver.DefaultServiceIPRange(c.ServiceIPRange)
+	serviceIPRange, apiServerServiceIP, err := DefaultServiceIPRange(c.ServiceIPRange)
 	if err != nil {
 		glog.Fatalf("Error determining service IP ranges: %v", err)
 	}
diff --git a/pkg/genericapiserver/services.go b/pkg/master/services.go
similarity index 98%
rename from pkg/genericapiserver/services.go
rename to pkg/master/services.go
index d6f71207a3..a0e510d1fd 100644
--- a/pkg/genericapiserver/services.go
+++ b/pkg/master/services.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package genericapiserver
+package master
 
 import (
 	"fmt"
diff --git a/pkg/registry/core/rest/storage_core.go b/pkg/registry/core/rest/storage_core.go
index 1e09a87bba..008cb681ad 100644
--- a/pkg/registry/core/rest/storage_core.go
+++ b/pkg/registry/core/rest/storage_core.go
@@ -59,6 +59,7 @@ import (
 	ipallocator "k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
 	"k8s.io/kubernetes/pkg/registry/core/service/portallocator"
 	serviceaccountetcd "k8s.io/kubernetes/pkg/registry/core/serviceaccount/etcd"
+	"k8s.io/kubernetes/pkg/registry/generic"
 	"k8s.io/kubernetes/pkg/runtime/schema"
 	etcdutil "k8s.io/kubernetes/pkg/storage/etcd/util"
 	utilnet "k8s.io/kubernetes/pkg/util/net"