diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 904edc04..4a678389 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -400,215 +400,215 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "da3b134bab57ebf23dedfec7e0004614dd4b5a24"
+			"Rev": "cced8e64b6ca92a8b6afcbfea3353ca016694a45"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
diff --git a/discovery/restmapper.go b/discovery/restmapper.go
index 6d1de8c1..df5ab035 100644
--- a/discovery/restmapper.go
+++ b/discovery/restmapper.go
@@ -18,6 +18,7 @@ package discovery
 
 import (
 	"fmt"
+	"strings"
 	"sync"
 
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -108,6 +109,7 @@ func NewRESTMapper(groupResources []*APIGroupResources, versionInterfaces meta.V
 				plural := gv.WithResource(resource.Name)
 				singular := gv.WithResource(resource.SingularName)
 				versionMapper.AddSpecific(gv.WithKind(resource.Kind), plural, singular, scope)
+				versionMapper.AddSpecific(gv.WithKind(strings.ToLower(resource.Kind)), plural, singular, scope)
 				// TODO this is producing unsafe guesses that don't actually work, but it matches previous behavior
 				versionMapper.Add(gv.WithKind(resource.Kind+"List"), scope)
 			}