diff --git a/contrib/completions/bash/kubectl b/contrib/completions/bash/kubectl
index 3173c5bf5ba..d7ebe9763f0 100644
--- a/contrib/completions/bash/kubectl
+++ b/contrib/completions/bash/kubectl
@@ -329,7 +329,6 @@ _kubectl_describe()
 
     must_have_one_flag=()
     must_have_one_noun=()
-    must_have_one_noun+=("daemonset")
     must_have_one_noun+=("limitrange")
     must_have_one_noun+=("minion")
     must_have_one_noun+=("namespace")
diff --git a/pkg/kubectl/describe.go b/pkg/kubectl/describe.go
index 2e0239b0293..48fbb12c4c8 100644
--- a/pkg/kubectl/describe.go
+++ b/pkg/kubectl/describe.go
@@ -69,7 +69,6 @@ func describerMap(c *client.Client) map[string]Describer {
 	m := map[string]Describer{
 		"Pod": &PodDescriber{c},
 		"ReplicationController": &ReplicationControllerDescriber{c},
-		"DaemonSet":             &DaemonSetDescriber{c},
 		"Secret":                &SecretDescriber{c},
 		"Service":               &ServiceDescriber{c},
 		"ServiceAccount":        &ServiceAccountDescriber{c},
@@ -87,7 +86,8 @@ func describerMap(c *client.Client) map[string]Describer {
 func expDescriberMap(c *client.Client) map[string]Describer {
 	return map[string]Describer{
 		"HorizontalPodAutoscaler": &HorizontalPodAutoscalerDescriber{c},
-		"Job": &JobDescriber{c},
+		"DaemonSet":               &DaemonSetDescriber{c},
+		"Job":                     &JobDescriber{c},
 	}
 }