diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go
index 8d286e73692..fbe982f4860 100644
--- a/cmd/integration/integration.go
+++ b/cmd/integration/integration.go
@@ -667,7 +667,7 @@ func runPatchTest(c *client.Client) {
 		glog.Fatalf("Failed creating patchservice: %v", err)
 	}
 
-	patchBodies := map[string]map[unversioned.PatchType]struct {
+	patchBodies := map[string]map[api.PatchType]struct {
 		AddLabelBody        []byte
 		RemoveLabelBody     []byte
 		RemoveAllLabelsBody []byte
@@ -693,7 +693,7 @@ func runPatchTest(c *client.Client) {
 
 	pb := patchBodies[c.APIVersion()]
 
-	execPatch := func(pt unversioned.PatchType, body []byte) error {
+	execPatch := func(pt api.PatchType, body []byte) error {
 		return c.Patch(pt).
 			Resource(resource).
 			Namespace(api.NamespaceDefault).
diff --git a/pkg/apiserver/resthandler.go b/pkg/apiserver/resthandler.go
index c13f65f59bb..200150e4cc2 100644
--- a/pkg/apiserver/resthandler.go
+++ b/pkg/apiserver/resthandler.go
@@ -407,7 +407,7 @@ func PatchResource(r rest.Patcher, scope RequestScope, typer runtime.ObjectTyper
 		if idx := strings.Index(contentType, ";"); idx > 0 {
 			contentType = contentType[:idx]
 		}
-		patchType := unversioned.PatchType(contentType)
+		patchType := api.PatchType(contentType)
 
 		patchJS, err := readBody(req.Request)
 		if err != nil {
@@ -432,7 +432,7 @@ func PatchResource(r rest.Patcher, scope RequestScope, typer runtime.ObjectTyper
 }
 
 // patchResource divides PatchResource for easier unit testing
-func patchResource(ctx api.Context, timeout time.Duration, versionedObj runtime.Object, patcher rest.Patcher, name string, patchType unversioned.PatchType, patchJS []byte, namer ScopeNamer, codec runtime.Codec) (runtime.Object, error) {
+func patchResource(ctx api.Context, timeout time.Duration, versionedObj runtime.Object, patcher rest.Patcher, name string, patchType api.PatchType, patchJS []byte, namer ScopeNamer, codec runtime.Codec) (runtime.Object, error) {
 	namespace := api.NamespaceValue(ctx)
 
 	original, err := patcher.Get(ctx, name)
@@ -806,7 +806,7 @@ func setListSelfLink(obj runtime.Object, req *restful.Request, namer ScopeNamer)
 
 }
 
-func getPatchedJS(patchType unversioned.PatchType, originalJS, patchJS []byte, obj runtime.Object) ([]byte, error) {
+func getPatchedJS(patchType api.PatchType, originalJS, patchJS []byte, obj runtime.Object) ([]byte, error) {
 	switch patchType {
 	case api.JSONPatchType:
 		patchObj, err := jsonpatch.DecodePatch(patchJS)
diff --git a/pkg/apiserver/resthandler_test.go b/pkg/apiserver/resthandler_test.go
index 0bd423703b8..18fdddd933a 100644
--- a/pkg/apiserver/resthandler_test.go
+++ b/pkg/apiserver/resthandler_test.go
@@ -169,7 +169,7 @@ func (tc *patchTestCase) Run(t *testing.T) {
 		return
 	}
 
-	for _, patchType := range []unversioned.PatchType{api.JSONPatchType, api.MergePatchType, api.StrategicMergePatchType} {
+	for _, patchType := range []api.PatchType{api.JSONPatchType, api.MergePatchType, api.StrategicMergePatchType} {
 		// TODO SUPPORT THIS!
 		if patchType == api.JSONPatchType {
 			continue
diff --git a/pkg/client/unversioned/fake/fake.go b/pkg/client/unversioned/fake/fake.go
index 9c1be399824..ecdc8bbf948 100644
--- a/pkg/client/unversioned/fake/fake.go
+++ b/pkg/client/unversioned/fake/fake.go
@@ -50,7 +50,7 @@ func (c *RESTClient) Put() *unversioned.Request {
 	return unversioned.NewRequest(c, "PUT", &url.URL{Host: "localhost"}, testapi.Default.Version(), c.Codec)
 }
 
-func (c *RESTClient) Patch(_ unversioned.PatchType) *unversioned.Request {
+func (c *RESTClient) Patch(_ api.PatchType) *unversioned.Request {
 	return unversioned.NewRequest(c, "PATCH", &url.URL{Host: "localhost"}, testapi.Default.Version(), c.Codec)
 }
 
diff --git a/pkg/client/unversioned/restclient.go b/pkg/client/unversioned/restclient.go
index 99462a666da..dcd2490f12e 100644
--- a/pkg/client/unversioned/restclient.go
+++ b/pkg/client/unversioned/restclient.go
@@ -104,7 +104,7 @@ func (c *RESTClient) Put() *Request {
 }
 
 // Patch begins a PATCH request. Short for c.Verb("Patch").
-func (c *RESTClient) Patch(pt unversioned.PatchType) *Request {
+func (c *RESTClient) Patch(pt api.PatchType) *Request {
 	return c.Verb("PATCH").SetHeader("Content-Type", string(pt))
 }
 
diff --git a/pkg/kubectl/interfaces.go b/pkg/kubectl/interfaces.go
index d39a822acd6..1c7dcd48d78 100644
--- a/pkg/kubectl/interfaces.go
+++ b/pkg/kubectl/interfaces.go
@@ -23,7 +23,7 @@ import client "k8s.io/kubernetes/pkg/client/unversioned"
 type RESTClient interface {
 	Get() *client.Request
 	Post() *client.Request
-	Patch(unversioned.PatchType) *client.Request
+	Patch(api.PatchType) *client.Request
 	Delete() *client.Request
 	Put() *client.Request
 }
diff --git a/pkg/kubectl/resource/helper.go b/pkg/kubectl/resource/helper.go
index 54c12a92856..cf6cc2a8c47 100644
--- a/pkg/kubectl/resource/helper.go
+++ b/pkg/kubectl/resource/helper.go
@@ -130,7 +130,7 @@ func (m *Helper) Create(namespace string, modify bool, data []byte) (runtime.Obj
 func (m *Helper) createResource(c RESTClient, resource, namespace string, data []byte) (runtime.Object, error) {
 	return c.Post().NamespaceIfScoped(namespace, m.NamespaceScoped).Resource(resource).Body(data).Do().Get()
 }
-func (m *Helper) Patch(namespace, name string, pt unversioned.PatchType, data []byte) (runtime.Object, error) {
+func (m *Helper) Patch(namespace, name string, pt api.PatchType, data []byte) (runtime.Object, error) {
 	return m.RESTClient.Patch(pt).
 		NamespaceIfScoped(namespace, m.NamespaceScoped).
 		Resource(m.Resource).
diff --git a/pkg/kubectl/resource/interfaces.go b/pkg/kubectl/resource/interfaces.go
index 1a07c36844d..dd8270d878a 100644
--- a/pkg/kubectl/resource/interfaces.go
+++ b/pkg/kubectl/resource/interfaces.go
@@ -26,7 +26,7 @@ import (
 type RESTClient interface {
 	Get() *client.Request
 	Post() *client.Request
-	Patch(unversioned.PatchType) *client.Request
+	Patch(api.PatchType) *client.Request
 	Delete() *client.Request
 	Put() *client.Request
 }