diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 11368c68..970e9d68 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -68,15 +68,15 @@
 		},
 		{
 			"ImportPath": "github.com/emicklei/go-restful",
-			"Rev": "09691a3b6378b740595c1002f40c34dd5f218a22"
+			"Rev": "ff4f55a206334ef123e4f79bbf348980da81ca46"
+		},
+		{
+			"ImportPath": "github.com/emicklei/go-restful-swagger12",
+			"Rev": "dcef7f55730566d41eae5db10e7d6981829720f6"
 		},
 		{
 			"ImportPath": "github.com/emicklei/go-restful/log",
-			"Rev": "09691a3b6378b740595c1002f40c34dd5f218a22"
-		},
-		{
-			"ImportPath": "github.com/emicklei/go-restful/swagger",
-			"Rev": "09691a3b6378b740595c1002f40c34dd5f218a22"
+			"Rev": "ff4f55a206334ef123e4f79bbf348980da81ca46"
 		},
 		{
 			"ImportPath": "github.com/ghodss/yaml",
diff --git a/discovery/BUILD b/discovery/BUILD
index 9c93c109..987e41f8 100644
--- a/discovery/BUILD
+++ b/discovery/BUILD
@@ -18,7 +18,7 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//vendor/github.com/emicklei/go-restful/swagger:go_default_library",
+        "//vendor/github.com/emicklei/go-restful-swagger12:go_default_library",
         "//vendor/github.com/go-openapi/loads:go_default_library",
         "//vendor/github.com/go-openapi/spec:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
@@ -45,7 +45,7 @@ go_test(
     ],
     tags = ["automanaged"],
     deps = [
-        "//vendor/github.com/emicklei/go-restful/swagger:go_default_library",
+        "//vendor/github.com/emicklei/go-restful-swagger12:go_default_library",
         "//vendor/github.com/go-openapi/spec:go_default_library",
         "//vendor/github.com/stretchr/testify/assert:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
diff --git a/discovery/discovery_client.go b/discovery/discovery_client.go
index aba1c482..0ee46b86 100644
--- a/discovery/discovery_client.go
+++ b/discovery/discovery_client.go
@@ -23,7 +23,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/emicklei/go-restful/swagger"
+	"github.com/emicklei/go-restful-swagger12"
 
 	"github.com/go-openapi/loads"
 	"github.com/go-openapi/spec"
diff --git a/discovery/discovery_client_test.go b/discovery/discovery_client_test.go
index f519ffaf..f4058991 100644
--- a/discovery/discovery_client_test.go
+++ b/discovery/discovery_client_test.go
@@ -24,7 +24,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/emicklei/go-restful/swagger"
+	"github.com/emicklei/go-restful-swagger12"
 
 	"github.com/go-openapi/spec"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/discovery/fake/BUILD b/discovery/fake/BUILD
index c8f646c0..6f894e36 100644
--- a/discovery/fake/BUILD
+++ b/discovery/fake/BUILD
@@ -12,7 +12,7 @@ go_library(
     srcs = ["discovery.go"],
     tags = ["automanaged"],
     deps = [
-        "//vendor/github.com/emicklei/go-restful/swagger:go_default_library",
+        "//vendor/github.com/emicklei/go-restful-swagger12:go_default_library",
         "//vendor/github.com/go-openapi/spec:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
diff --git a/discovery/fake/discovery.go b/discovery/fake/discovery.go
index 9a953efc..eb2be254 100644
--- a/discovery/fake/discovery.go
+++ b/discovery/fake/discovery.go
@@ -19,7 +19,7 @@ package fake
 import (
 	"fmt"
 
-	"github.com/emicklei/go-restful/swagger"
+	"github.com/emicklei/go-restful-swagger12"
 
 	"github.com/go-openapi/spec"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/discovery/restmapper_test.go b/discovery/restmapper_test.go
index baa16b82..6bc16ccb 100644
--- a/discovery/restmapper_test.go
+++ b/discovery/restmapper_test.go
@@ -28,7 +28,7 @@ import (
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/client-go/rest/fake"
 
-	"github.com/emicklei/go-restful/swagger"
+	"github.com/emicklei/go-restful-swagger12"
 	"github.com/go-openapi/spec"
 	"github.com/stretchr/testify/assert"
 )