diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 8724f2d60..a07ed87e8 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -316,15 +316,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/evanphx/json-patch",
diff --git a/pkg/server/BUILD b/pkg/server/BUILD
index 590f47f50..474f68999 100644
--- a/pkg/server/BUILD
+++ b/pkg/server/BUILD
@@ -55,7 +55,7 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//vendor/github.com/coreos/go-systemd/daemon:go_default_library",
-        "//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/golang/glog:go_default_library",
         "//vendor/github.com/pborman/uuid:go_default_library",
diff --git a/pkg/server/config.go b/pkg/server/config.go
index a183d2841..26d561455 100644
--- a/pkg/server/config.go
+++ b/pkg/server/config.go
@@ -29,7 +29,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/emicklei/go-restful/swagger"
+	"github.com/emicklei/go-restful-swagger12"
 	"github.com/go-openapi/spec"
 	"github.com/pborman/uuid"
 
diff --git a/pkg/server/genericapiserver.go b/pkg/server/genericapiserver.go
index 8f8ead030..52d5368d6 100644
--- a/pkg/server/genericapiserver.go
+++ b/pkg/server/genericapiserver.go
@@ -25,7 +25,7 @@ import (
 	"time"
 
 	systemd "github.com/coreos/go-systemd/daemon"
-	"github.com/emicklei/go-restful/swagger"
+	"github.com/emicklei/go-restful-swagger12"
 	"github.com/golang/glog"
 
 	"k8s.io/apimachinery/pkg/apimachinery"
diff --git a/pkg/server/routes/BUILD b/pkg/server/routes/BUILD
index 38689189b..2dd8b05bd 100644
--- a/pkg/server/routes/BUILD
+++ b/pkg/server/routes/BUILD
@@ -23,7 +23,7 @@ go_library(
     deps = [
         "//vendor/github.com/elazarl/go-bindata-assetfs:go_default_library",
         "//vendor/github.com/emicklei/go-restful:go_default_library",
-        "//vendor/github.com/emicklei/go-restful/swagger:go_default_library",
+        "//vendor/github.com/emicklei/go-restful-swagger12:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
diff --git a/pkg/server/routes/swagger.go b/pkg/server/routes/swagger.go
index fb62c65b0..90f0abf76 100644
--- a/pkg/server/routes/swagger.go
+++ b/pkg/server/routes/swagger.go
@@ -19,7 +19,7 @@ package routes
 import (
 	"k8s.io/apiserver/pkg/server/mux"
 
-	"github.com/emicklei/go-restful/swagger"
+	"github.com/emicklei/go-restful-swagger12"
 )
 
 // Swagger installs the /swaggerapi/ endpoint to allow schema discovery