diff --git a/contrib/completions/bash/kubectl b/contrib/completions/bash/kubectl
index d5a05a1b838..ff6fa418155 100644
--- a/contrib/completions/bash/kubectl
+++ b/contrib/completions/bash/kubectl
@@ -926,9 +926,9 @@ _kubectl()
     flags+=("-h")
     flags+=("--insecure-skip-tls-verify")
     flags+=("--kubeconfig=")
-    flags+=("--log_backtrace_at=")
-    flags+=("--log_dir=")
-    flags+=("--log_flush_frequency=")
+    flags+=("--log-backtrace-at=")
+    flags+=("--log-dir=")
+    flags+=("--log-flush-frequency=")
     flags+=("--logtostderr")
     flags+=("--match-server-version")
     flags+=("--namespace=")
diff --git a/docs/kubectl.md b/docs/kubectl.md
index 664e8adc06b..fdfc56bd77d 100644
--- a/docs/kubectl.md
+++ b/docs/kubectl.md
@@ -26,9 +26,9 @@ kubectl
   -h, --help=false: help for kubectl
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
diff --git a/docs/kubectl_api-versions.md b/docs/kubectl_api-versions.md
index db233306f7c..84cc4657bd2 100644
--- a/docs/kubectl_api-versions.md
+++ b/docs/kubectl_api-versions.md
@@ -29,9 +29,9 @@ kubectl api-versions
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -49,6 +49,6 @@ kubectl api-versions
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-05-15 00:05:04.555704962 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.231770799 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_api-versions.md?pixel)]()
diff --git a/docs/kubectl_cluster-info.md b/docs/kubectl_cluster-info.md
index f25121ec121..833c465b595 100644
--- a/docs/kubectl_cluster-info.md
+++ b/docs/kubectl_cluster-info.md
@@ -29,9 +29,9 @@ kubectl cluster-info
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -49,6 +49,6 @@ kubectl cluster-info
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-05-15 00:05:04.555514789 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.230831561 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_cluster-info.md?pixel)]()
diff --git a/docs/kubectl_config.md b/docs/kubectl_config.md
index 56963f8adf8..28bc1db5707 100644
--- a/docs/kubectl_config.md
+++ b/docs/kubectl_config.md
@@ -35,9 +35,9 @@ kubectl config SUBCOMMAND
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -62,6 +62,6 @@ kubectl config SUBCOMMAND
 * [kubectl config use-context](kubectl_config_use-context.md)	 - Sets the current-context in a kubeconfig file
 * [kubectl config view](kubectl_config_view.md)	 - displays Merged kubeconfig settings or a specified kubeconfig file.
 
-###### Auto generated by spf13/cobra at 2015-05-15 00:05:04.555327159 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.229842268 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_config.md?pixel)]()
diff --git a/docs/kubectl_config_set-cluster.md b/docs/kubectl_config_set-cluster.md
index 081cc21922a..84310b3b7a8 100644
--- a/docs/kubectl_config_set-cluster.md
+++ b/docs/kubectl_config_set-cluster.md
@@ -45,9 +45,9 @@ $ kubectl config set-cluster e2e --insecure-skip-tls-verify=true
       --cluster="": The name of the kubeconfig cluster to use
       --context="": The name of the kubeconfig context to use
       --kubeconfig="": use a particular kubeconfig file
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -64,6 +64,6 @@ $ kubectl config set-cluster e2e --insecure-skip-tls-verify=true
 ### SEE ALSO
 * [kubectl config](kubectl_config.md)	 - config modifies kubeconfig files
 
-###### Auto generated by spf13/cobra at 2015-05-15 00:05:04.553839852 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.222182293 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_config_set-cluster.md?pixel)]()
diff --git a/docs/kubectl_config_set-context.md b/docs/kubectl_config_set-context.md
index 0c6a2c7d124..a3bdc0596c8 100644
--- a/docs/kubectl_config_set-context.md
+++ b/docs/kubectl_config_set-context.md
@@ -39,9 +39,9 @@ $ kubectl config set-context gce --user=cluster-admin
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": use a particular kubeconfig file
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --password="": Password for basic authentication to the API server.
@@ -57,6 +57,6 @@ $ kubectl config set-context gce --user=cluster-admin
 ### SEE ALSO
 * [kubectl config](kubectl_config.md)	 - config modifies kubeconfig files
 
-###### Auto generated by spf13/cobra at 2015-05-15 00:05:04.554224777 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.225463229 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_config_set-context.md?pixel)]()
diff --git a/docs/kubectl_config_set-credentials.md b/docs/kubectl_config_set-credentials.md
index f85fcdc0375..9f7f9639aee 100644
--- a/docs/kubectl_config_set-credentials.md
+++ b/docs/kubectl_config_set-credentials.md
@@ -60,9 +60,9 @@ $ kubectl set-credentials cluster-admin --client-certificate=~/.kube/admin.crt -
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": use a particular kubeconfig file
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -77,6 +77,6 @@ $ kubectl set-credentials cluster-admin --client-certificate=~/.kube/admin.crt -
 ### SEE ALSO
 * [kubectl config](kubectl_config.md)	 - config modifies kubeconfig files
 
-###### Auto generated by spf13/cobra at 2015-05-15 00:05:04.55402965 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.22419139 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_config_set-credentials.md?pixel)]()
diff --git a/docs/kubectl_config_set.md b/docs/kubectl_config_set.md
index 3d71b197004..a4bfb564bb6 100644
--- a/docs/kubectl_config_set.md
+++ b/docs/kubectl_config_set.md
@@ -31,9 +31,9 @@ kubectl config set PROPERTY_NAME PROPERTY_VALUE
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": use a particular kubeconfig file
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -51,6 +51,6 @@ kubectl config set PROPERTY_NAME PROPERTY_VALUE
 ### SEE ALSO
 * [kubectl config](kubectl_config.md)	 - config modifies kubeconfig files
 
-###### Auto generated by spf13/cobra at 2015-05-15 00:05:04.554534222 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.226564217 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_config_set.md?pixel)]()
diff --git a/docs/kubectl_config_unset.md b/docs/kubectl_config_unset.md
index edef529c373..1a1c567cc46 100644
--- a/docs/kubectl_config_unset.md
+++ b/docs/kubectl_config_unset.md
@@ -30,9 +30,9 @@ kubectl config unset PROPERTY_NAME
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": use a particular kubeconfig file
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -50,6 +50,6 @@ kubectl config unset PROPERTY_NAME
 ### SEE ALSO
 * [kubectl config](kubectl_config.md)	 - config modifies kubeconfig files
 
-###### Auto generated by spf13/cobra at 2015-05-15 00:05:04.554933161 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.228039789 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_config_unset.md?pixel)]()
diff --git a/docs/kubectl_config_use-context.md b/docs/kubectl_config_use-context.md
index 7a370fdbedd..bb978a9ce9e 100644
--- a/docs/kubectl_config_use-context.md
+++ b/docs/kubectl_config_use-context.md
@@ -29,9 +29,9 @@ kubectl config use-context CONTEXT_NAME
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": use a particular kubeconfig file
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -49,6 +49,6 @@ kubectl config use-context CONTEXT_NAME
 ### SEE ALSO
 * [kubectl config](kubectl_config.md)	 - config modifies kubeconfig files
 
-###### Auto generated by spf13/cobra at 2015-05-15 00:05:04.555123528 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.228948447 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_config_use-context.md?pixel)]()
diff --git a/docs/kubectl_config_view.md b/docs/kubectl_config_view.md
index 76635a2c9bd..3b3f92d085c 100644
--- a/docs/kubectl_config_view.md
+++ b/docs/kubectl_config_view.md
@@ -52,9 +52,9 @@ $ kubectl config view -o template --template='{{range .users}}{{ if eq .name "e2
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": use a particular kubeconfig file
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -72,6 +72,6 @@ $ kubectl config view -o template --template='{{range .users}}{{ if eq .name "e2
 ### SEE ALSO
 * [kubectl config](kubectl_config.md)	 - config modifies kubeconfig files
 
-###### Auto generated by spf13/cobra at 2015-05-15 00:05:04.553648867 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.216559289 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_config_view.md?pixel)]()
diff --git a/docs/kubectl_create.md b/docs/kubectl_create.md
index 6ceee542d5b..df449ef0706 100644
--- a/docs/kubectl_create.md
+++ b/docs/kubectl_create.md
@@ -42,9 +42,9 @@ $ cat pod.json | kubectl create -f -
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -62,6 +62,6 @@ $ cat pod.json | kubectl create -f -
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-05-15 00:05:04.550199549 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.178299587 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_create.md?pixel)]()
diff --git a/docs/kubectl_delete.md b/docs/kubectl_delete.md
index 1e02a90a35b..df5e54cbc68 100644
--- a/docs/kubectl_delete.md
+++ b/docs/kubectl_delete.md
@@ -62,9 +62,9 @@ $ kubectl delete pods --all
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -82,6 +82,6 @@ $ kubectl delete pods --all
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-05-15 00:05:04.550666007 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.18056941 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_delete.md?pixel)]()
diff --git a/docs/kubectl_describe.md b/docs/kubectl_describe.md
index a1bfc2a467a..a4936229b97 100644
--- a/docs/kubectl_describe.md
+++ b/docs/kubectl_describe.md
@@ -42,9 +42,9 @@ $ kubectl describe pods/nginx
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -62,6 +62,6 @@ $ kubectl describe pods/nginx
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-05-15 00:05:04.549970974 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.177122438 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_describe.md?pixel)]()
diff --git a/docs/kubectl_exec.md b/docs/kubectl_exec.md
index 827877f6097..6bae1d1b1c6 100644
--- a/docs/kubectl_exec.md
+++ b/docs/kubectl_exec.md
@@ -43,9 +43,9 @@ $ kubectl exec -p 123456-7890 -c ruby-container -i -t -- bash -il
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -63,6 +63,6 @@ $ kubectl exec -p 123456-7890 -c ruby-container -i -t -- bash -il
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-05-15 00:05:04.551970235 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.186469192 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_exec.md?pixel)]()
diff --git a/docs/kubectl_expose.md b/docs/kubectl_expose.md
index 95d8eda686e..2bf78a3d245 100644
--- a/docs/kubectl_expose.md
+++ b/docs/kubectl_expose.md
@@ -63,9 +63,9 @@ $ kubectl expose rc streamer --port=4100 --protocol=udp --name=video-stream
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -83,6 +83,6 @@ $ kubectl expose rc streamer --port=4100 --protocol=udp --name=video-stream
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-05-19 14:12:47.467953048 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.197790185 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_expose.md?pixel)]()
diff --git a/docs/kubectl_get.md b/docs/kubectl_get.md
index 9e94863c178..9522f4dd4c0 100644
--- a/docs/kubectl_get.md
+++ b/docs/kubectl_get.md
@@ -65,9 +65,9 @@ $ kubectl get rc/web service/frontend pods/web-pod-13je7
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
diff --git a/docs/kubectl_label.md b/docs/kubectl_label.md
index 38b62e34542..9897bdaa331 100644
--- a/docs/kubectl_label.md
+++ b/docs/kubectl_label.md
@@ -60,9 +60,9 @@ $ kubectl label pods foo bar-
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -80,6 +80,6 @@ $ kubectl label pods foo bar-
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-05-15 00:05:04.553433439 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.210679161 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_label.md?pixel)]()
diff --git a/docs/kubectl_logs.md b/docs/kubectl_logs.md
index 73964e20c64..669e08c3a0b 100644
--- a/docs/kubectl_logs.md
+++ b/docs/kubectl_logs.md
@@ -45,9 +45,9 @@ $ kubectl logs -f 123456-7890 ruby-container
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
diff --git a/docs/kubectl_namespace.md b/docs/kubectl_namespace.md
index 8a5d903c12e..a87e6f5e905 100644
--- a/docs/kubectl_namespace.md
+++ b/docs/kubectl_namespace.md
@@ -32,9 +32,9 @@ kubectl namespace [namespace]
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -52,6 +52,6 @@ kubectl namespace [namespace]
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-05-15 00:05:04.550855698 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.181662849 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_namespace.md?pixel)]()
diff --git a/docs/kubectl_port-forward.md b/docs/kubectl_port-forward.md
index cc276949414..fc127cd59d0 100644
--- a/docs/kubectl_port-forward.md
+++ b/docs/kubectl_port-forward.md
@@ -47,9 +47,9 @@ $ kubectl port-forward -p mypod 0:5000
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -67,6 +67,6 @@ $ kubectl port-forward -p mypod 0:5000
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-05-15 00:05:04.552168206 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.187520496 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_port-forward.md?pixel)]()
diff --git a/docs/kubectl_proxy.md b/docs/kubectl_proxy.md
index 91e5d0bff28..abf695beaaa 100644
--- a/docs/kubectl_proxy.md
+++ b/docs/kubectl_proxy.md
@@ -44,9 +44,9 @@ $ kubectl proxy --api-prefix=k8s-api
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -64,6 +64,6 @@ $ kubectl proxy --api-prefix=k8s-api
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-05-15 00:05:04.552348175 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.188518514 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_proxy.md?pixel)]()
diff --git a/docs/kubectl_resize.md b/docs/kubectl_resize.md
index 7c4117dd18d..c2e61e7531a 100644
--- a/docs/kubectl_resize.md
+++ b/docs/kubectl_resize.md
@@ -47,9 +47,9 @@ $ kubectl resize --current-replicas=2 --replicas=3 replicationcontrollers foo
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -67,6 +67,6 @@ $ kubectl resize --current-replicas=2 --replicas=3 replicationcontrollers foo
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-05-15 00:05:04.551722394 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.185268791 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_resize.md?pixel)]()
diff --git a/docs/kubectl_rolling-update.md b/docs/kubectl_rolling-update.md
index 627583d63e7..31a3650a907 100644
--- a/docs/kubectl_rolling-update.md
+++ b/docs/kubectl_rolling-update.md
@@ -63,9 +63,9 @@ $ kubectl rolling-update frontend --image=image:v2
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -83,6 +83,6 @@ $ kubectl rolling-update frontend --image=image:v2
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-05-15 00:05:04.551455635 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.184123104 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_rolling-update.md?pixel)]()
diff --git a/docs/kubectl_run-container.md b/docs/kubectl_run-container.md
index f557f8c21fb..5c03489da9f 100644
--- a/docs/kubectl_run-container.md
+++ b/docs/kubectl_run-container.md
@@ -58,9 +58,9 @@ $ kubectl run-container nginx --image=nginx --overrides='{ "apiVersion": "v1beta
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -78,6 +78,6 @@ $ kubectl run-container nginx --image=nginx --overrides='{ "apiVersion": "v1beta
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-05-18 20:22:53.529935618 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.189857293 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_run-container.md?pixel)]()
diff --git a/docs/kubectl_stop.md b/docs/kubectl_stop.md
index 23546e95239..8269bc82a12 100644
--- a/docs/kubectl_stop.md
+++ b/docs/kubectl_stop.md
@@ -52,9 +52,9 @@ $ kubectl stop -f path/to/resources
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -72,6 +72,6 @@ $ kubectl stop -f path/to/resources
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-05-15 00:05:04.552969845 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.190996891 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_stop.md?pixel)]()
diff --git a/docs/kubectl_update.md b/docs/kubectl_update.md
index 9b5cbaa48a5..6029b2aee2e 100644
--- a/docs/kubectl_update.md
+++ b/docs/kubectl_update.md
@@ -46,9 +46,9 @@ $ kubectl update pods my-pod --patch='{ "apiVersion": "v1beta1", "desiredState":
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -66,6 +66,6 @@ $ kubectl update pods my-pod --patch='{ "apiVersion": "v1beta1", "desiredState":
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-05-15 00:05:04.550430092 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.179469636 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_update.md?pixel)]()
diff --git a/docs/kubectl_version.md b/docs/kubectl_version.md
index 79365f56356..9c2effe792c 100644
--- a/docs/kubectl_version.md
+++ b/docs/kubectl_version.md
@@ -30,9 +30,9 @@ kubectl version
       --context="": The name of the kubeconfig context to use
       --insecure-skip-tls-verify=false: If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
       --kubeconfig="": Path to the kubeconfig file to use for CLI requests.
-      --log_backtrace_at=:0: when logging hits line file:N, emit a stack trace
-      --log_dir=: If non-empty, write log files in this directory
-      --log_flush_frequency=5s: Maximum number of seconds between log flushes
+      --log-backtrace-at=:0: when logging hits line file:N, emit a stack trace
+      --log-dir=: If non-empty, write log files in this directory
+      --log-flush-frequency=5s: Maximum number of seconds between log flushes
       --logtostderr=true: log to standard error instead of files
       --match-server-version=false: Require server version to match client version
       --namespace="": If present, the namespace scope for this CLI request.
@@ -50,6 +50,6 @@ kubectl version
 ### SEE ALSO
 * [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
 
-###### Auto generated by spf13/cobra at 2015-05-15 00:05:04.555991019 +0000 UTC
+###### Auto generated by spf13/cobra at 2015-05-21 10:33:11.232741611 +0000 UTC
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/kubectl_version.md?pixel)]()
diff --git a/docs/man/man1/kubectl-api-versions.1 b/docs/man/man1/kubectl-api-versions.1
index 0c66fdba938..c4212fd1d46 100644
--- a/docs/man/man1/kubectl-api-versions.1
+++ b/docs/man/man1/kubectl-api-versions.1
@@ -60,15 +60,15 @@ Print available API versions.
     Path to the kubeconfig file to use for CLI requests.
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-cluster-info.1 b/docs/man/man1/kubectl-cluster-info.1
index df5e04fd01c..3f64ae37ab1 100644
--- a/docs/man/man1/kubectl-cluster-info.1
+++ b/docs/man/man1/kubectl-cluster-info.1
@@ -60,15 +60,15 @@ Display addresses of the master and services with label kubernetes.io/cluster\-s
     Path to the kubeconfig file to use for CLI requests.
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-config-set-cluster.1 b/docs/man/man1/kubectl-config-set-cluster.1
index a99b2cee93f..374e37bbad7 100644
--- a/docs/man/man1/kubectl-config-set-cluster.1
+++ b/docs/man/man1/kubectl-config-set-cluster.1
@@ -69,15 +69,15 @@ Specifying a name that already exists will merge new fields on top of existing v
     use a particular kubeconfig file
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-config-set-context.1 b/docs/man/man1/kubectl-config-set-context.1
index 987073b8f77..4e7928418ed 100644
--- a/docs/man/man1/kubectl-config-set-context.1
+++ b/docs/man/man1/kubectl-config-set-context.1
@@ -69,15 +69,15 @@ Specifying a name that already exists will merge new fields on top of existing v
     use a particular kubeconfig file
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-config-set-credentials.1 b/docs/man/man1/kubectl-config-set-credentials.1
index 63e4ad24026..1638f4bed7c 100644
--- a/docs/man/man1/kubectl-config-set-credentials.1
+++ b/docs/man/man1/kubectl-config-set-credentials.1
@@ -92,15 +92,15 @@ Bearer token and basic auth are mutually exclusive.
     use a particular kubeconfig file
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-config-set.1 b/docs/man/man1/kubectl-config-set.1
index 25a449dc44f..f83ea2edaa2 100644
--- a/docs/man/man1/kubectl-config-set.1
+++ b/docs/man/man1/kubectl-config-set.1
@@ -62,15 +62,15 @@ PROPERTY\_VALUE is the new value you wish to set.
     use a particular kubeconfig file
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-config-unset.1 b/docs/man/man1/kubectl-config-unset.1
index ea10fae82a7..cea12d2e81a 100644
--- a/docs/man/man1/kubectl-config-unset.1
+++ b/docs/man/man1/kubectl-config-unset.1
@@ -61,15 +61,15 @@ PROPERTY\_NAME is a dot delimited name where each token represents either a attr
     use a particular kubeconfig file
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-config-use-context.1 b/docs/man/man1/kubectl-config-use-context.1
index cabbdaf8aad..4ae194bd2a6 100644
--- a/docs/man/man1/kubectl-config-use-context.1
+++ b/docs/man/man1/kubectl-config-use-context.1
@@ -60,15 +60,15 @@ Sets the current\-context in a kubeconfig file
     use a particular kubeconfig file
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-config-view.1 b/docs/man/man1/kubectl-config-view.1
index 5036cabcc23..85ab4c3c7d7 100644
--- a/docs/man/man1/kubectl-config-view.1
+++ b/docs/man/man1/kubectl-config-view.1
@@ -96,15 +96,15 @@ You can use \-\-output=template \-\-template=TEMPLATE to extract specific values
     use a particular kubeconfig file
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-config.1 b/docs/man/man1/kubectl-config.1
index fb6687cf2e1..66eb5e8a1a2 100644
--- a/docs/man/man1/kubectl-config.1
+++ b/docs/man/man1/kubectl-config.1
@@ -66,15 +66,15 @@ The loading order follows these rules:
     If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-create.1 b/docs/man/man1/kubectl-create.1
index f77d10e17d4..b0c511d36d1 100644
--- a/docs/man/man1/kubectl-create.1
+++ b/docs/man/man1/kubectl-create.1
@@ -67,15 +67,15 @@ JSON and YAML formats are accepted.
     Path to the kubeconfig file to use for CLI requests.
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-delete.1 b/docs/man/man1/kubectl-delete.1
index c28b1d15c32..bf955c71261 100644
--- a/docs/man/man1/kubectl-delete.1
+++ b/docs/man/man1/kubectl-delete.1
@@ -92,15 +92,15 @@ will be lost along with the rest of the resource.
     Path to the kubeconfig file to use for CLI requests.
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-describe.1 b/docs/man/man1/kubectl-describe.1
index a165eca4d1c..f8856055a3f 100644
--- a/docs/man/man1/kubectl-describe.1
+++ b/docs/man/man1/kubectl-describe.1
@@ -64,15 +64,15 @@ given resource.
     Path to the kubeconfig file to use for CLI requests.
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-exec.1 b/docs/man/man1/kubectl-exec.1
index c22746ab7e3..927ddfa52f7 100644
--- a/docs/man/man1/kubectl-exec.1
+++ b/docs/man/man1/kubectl-exec.1
@@ -76,15 +76,15 @@ Execute a command in a container.
     Path to the kubeconfig file to use for CLI requests.
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-expose.1 b/docs/man/man1/kubectl-expose.1
index 15fc38cd831..27080b546df 100644
--- a/docs/man/man1/kubectl-expose.1
+++ b/docs/man/man1/kubectl-expose.1
@@ -134,15 +134,15 @@ re\-use the labels from the resource it exposes.
     Path to the kubeconfig file to use for CLI requests.
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-get.1 b/docs/man/man1/kubectl-get.1
index 3644ab9a061..8414924bad5 100644
--- a/docs/man/man1/kubectl-get.1
+++ b/docs/man/man1/kubectl-get.1
@@ -101,15 +101,15 @@ of the \-\-template flag, you can filter the attributes of the fetched resource(
     Path to the kubeconfig file to use for CLI requests.
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-label.1 b/docs/man/man1/kubectl-label.1
index 00946e8319b..fe7037eee90 100644
--- a/docs/man/man1/kubectl-label.1
+++ b/docs/man/man1/kubectl-label.1
@@ -97,15 +97,15 @@ If \-\-resource\-version is specified, then updates will use this resource versi
     Path to the kubeconfig file to use for CLI requests.
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-logs.1 b/docs/man/man1/kubectl-logs.1
index 97d2da1ff40..148efd87678 100644
--- a/docs/man/man1/kubectl-logs.1
+++ b/docs/man/man1/kubectl-logs.1
@@ -72,15 +72,15 @@ Print the logs for a container in a pod. If the pod has only one container, the
     Path to the kubeconfig file to use for CLI requests.
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-namespace.1 b/docs/man/man1/kubectl-namespace.1
index 95094304347..94b04c52a9e 100644
--- a/docs/man/man1/kubectl-namespace.1
+++ b/docs/man/man1/kubectl-namespace.1
@@ -63,15 +63,15 @@ namespace has been superceded by the context.namespace field of .kubeconfig file
     Path to the kubeconfig file to use for CLI requests.
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-port-forward.1 b/docs/man/man1/kubectl-port-forward.1
index ee535ccd456..6d52308dd3e 100644
--- a/docs/man/man1/kubectl-port-forward.1
+++ b/docs/man/man1/kubectl-port-forward.1
@@ -64,15 +64,15 @@ Forward one or more local ports to a pod.
     Path to the kubeconfig file to use for CLI requests.
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-proxy.1 b/docs/man/man1/kubectl-proxy.1
index ccb42822da0..8d977ee583e 100644
--- a/docs/man/man1/kubectl-proxy.1
+++ b/docs/man/man1/kubectl-proxy.1
@@ -76,15 +76,15 @@ Run a proxy to the Kubernetes API server.
     Path to the kubeconfig file to use for CLI requests.
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-resize.1 b/docs/man/man1/kubectl-resize.1
index 86ecbb583b0..f14c8e7e6a3 100644
--- a/docs/man/man1/kubectl-resize.1
+++ b/docs/man/man1/kubectl-resize.1
@@ -78,15 +78,15 @@ resize is sent to the server.
     Path to the kubeconfig file to use for CLI requests.
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-rolling-update.1 b/docs/man/man1/kubectl-rolling-update.1
index c5d28ffe22f..6483932c16e 100644
--- a/docs/man/man1/kubectl-rolling-update.1
+++ b/docs/man/man1/kubectl-rolling-update.1
@@ -114,15 +114,15 @@ existing controller and overwrite at least one (common) label in its replicaSele
     Path to the kubeconfig file to use for CLI requests.
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-run-container.1 b/docs/man/man1/kubectl-run-container.1
index 11633c2d32f..ab4f97ff47f 100644
--- a/docs/man/man1/kubectl-run-container.1
+++ b/docs/man/man1/kubectl-run-container.1
@@ -110,15 +110,15 @@ Creates a replication controller to manage the created container(s).
     Path to the kubeconfig file to use for CLI requests.
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-stop.1 b/docs/man/man1/kubectl-stop.1
index 54de59515af..a37ec617f94 100644
--- a/docs/man/man1/kubectl-stop.1
+++ b/docs/man/man1/kubectl-stop.1
@@ -80,15 +80,15 @@ If the resource is resizable it will be resized to 0 before deletion.
     Path to the kubeconfig file to use for CLI requests.
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-update.1 b/docs/man/man1/kubectl-update.1
index 92e8dfac6a7..2740c025edd 100644
--- a/docs/man/man1/kubectl-update.1
+++ b/docs/man/man1/kubectl-update.1
@@ -71,15 +71,15 @@ JSON and YAML formats are accepted.
     Path to the kubeconfig file to use for CLI requests.
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl-version.1 b/docs/man/man1/kubectl-version.1
index 984fb3810ef..d91fca6c10f 100644
--- a/docs/man/man1/kubectl-version.1
+++ b/docs/man/man1/kubectl-version.1
@@ -64,15 +64,15 @@ Print the client and server version information.
     Path to the kubeconfig file to use for CLI requests.
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/docs/man/man1/kubectl.1 b/docs/man/man1/kubectl.1
index c571f300926..60edc87cd53 100644
--- a/docs/man/man1/kubectl.1
+++ b/docs/man/man1/kubectl.1
@@ -62,15 +62,15 @@ Find more information at
     Path to the kubeconfig file to use for CLI requests.
 
 .PP
-\fB\-\-log\_backtrace\_at\fP=:0
+\fB\-\-log\-backtrace\-at\fP=:0
     when logging hits line file:N, emit a stack trace
 
 .PP
-\fB\-\-log\_dir\fP=""
+\fB\-\-log\-dir\fP=""
     If non\-empty, write log files in this directory
 
 .PP
-\fB\-\-log\_flush\_frequency\fP=5s
+\fB\-\-log\-flush\-frequency\fP=5s
     Maximum number of seconds between log flushes
 
 .PP
diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go
index c251f60d65e..e6859c9d5d3 100644
--- a/pkg/kubectl/cmd/cmd.go
+++ b/pkg/kubectl/cmd/cmd.go
@@ -21,6 +21,7 @@ import (
 
 	cmdconfig "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/config"
 	cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 	"github.com/golang/glog"
 
 	"github.com/spf13/cobra"
@@ -107,6 +108,9 @@ Find more information at https://github.com/GoogleCloudPlatform/kubernetes.`,
 
 	f.BindFlags(cmds.PersistentFlags())
 
+	// From this point and forward we get warnings on flags that contain "_" separators
+	cmds.SetGlobalNormalizationFunc(util.WarnWordSepNormalizeFunc)
+
 	cmds.AddCommand(NewCmdGet(f, out))
 	cmds.AddCommand(NewCmdDescribe(f, out))
 	cmds.AddCommand(NewCmdCreate(f, out))
diff --git a/pkg/kubectl/cmd/cmd_test.go b/pkg/kubectl/cmd/cmd_test.go
index 777a39d673e..c95f26c29e1 100644
--- a/pkg/kubectl/cmd/cmd_test.go
+++ b/pkg/kubectl/cmd/cmd_test.go
@@ -22,6 +22,7 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
+	"reflect"
 	"testing"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
@@ -276,3 +277,29 @@ func ExamplePrintReplicationController() {
 	// CONTROLLER   CONTAINER(S)   IMAGE(S)    SELECTOR   REPLICAS
 	// foo          foo            someimage   foo=bar    1
 }
+
+func TestNormalizationFuncGlobalExistance(t *testing.T) {
+	// This test can be safely deleted when we will not support multiple flag formats
+	root := NewKubectlCommand(cmdutil.NewFactory(nil), os.Stdin, os.Stdout, os.Stderr)
+
+	if root.Parent() != nil {
+		t.Fatal("We expect the root command to be returned")
+	}
+	if root.GlobalNormalizationFunc() == nil {
+		t.Fatal("We expect that root command has a global normalization function")
+	}
+
+	if reflect.ValueOf(root.GlobalNormalizationFunc()).Pointer() != reflect.ValueOf(root.Flags().GetNormalizeFunc()).Pointer() {
+		t.Fatal("root command seems to have a wrong normalization function")
+	}
+
+	sub := root
+	for sub.HasSubCommands() {
+		sub = sub.Commands()[0]
+	}
+
+	// In case of failure of this test check this PR: spf13/cobra#110
+	if reflect.ValueOf(sub.Flags().GetNormalizeFunc()).Pointer() != reflect.ValueOf(root.Flags().GetNormalizeFunc()).Pointer() {
+		t.Fatal("child and root commands should have the same normalization functions")
+	}
+}
diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go
index c92b57a885b..18e86181dd7 100644
--- a/pkg/kubectl/cmd/util/factory.go
+++ b/pkg/kubectl/cmd/util/factory.go
@@ -90,7 +90,7 @@ func NewFactory(optionalClientConfig clientcmd.ClientConfig) *Factory {
 	mapper := kubectl.ShortcutExpander{latest.RESTMapper}
 
 	flags := pflag.NewFlagSet("", pflag.ContinueOnError)
-	flags.SetNormalizeFunc(util.WordSepNormalizeFunc)
+	flags.SetNormalizeFunc(util.WarnWordSepNormalizeFunc) // Warn for "_" flags
 
 	generators := map[string]kubectl.Generator{
 		"run-container/v1": kubectl.BasicReplicationController{},
@@ -236,17 +236,18 @@ func (f *Factory) BindFlags(flags *pflag.FlagSet) {
 		f.flags.Bool("validate", false, "If true, use a schema to validate the input before sending it")
 	}
 
-	if f.flags != nil {
-		f.flags.VisitAll(func(flag *pflag.Flag) {
-			flags.AddFlag(flag)
-		})
-	}
+	// Merge factory's flags
+	util.AddPFlagSetToPFlagSet(f.flags, flags)
 
 	// Globally persistent flags across all subcommands.
 	// TODO Change flag names to consts to allow safer lookup from subcommands.
 	// TODO Add a verbose flag that turns on glog logging. Probably need a way
 	// to do that automatically for every subcommand.
 	flags.BoolVar(&f.clients.matchVersion, FlagMatchBinaryVersion, false, "Require server version to match client version")
+
+	// Normalize all flags that are comming from other packages or pre-configurations
+	// a.k.a. change all "_" to "-". e.g. glog package
+	flags.SetNormalizeFunc(util.WordSepNormalizeFunc)
 }
 
 func getPorts(spec api.PodSpec) []string {
diff --git a/pkg/kubectl/cmd/util/factory_test.go b/pkg/kubectl/cmd/util/factory_test.go
index 06569027fa9..ead27c09474 100644
--- a/pkg/kubectl/cmd/util/factory_test.go
+++ b/pkg/kubectl/cmd/util/factory_test.go
@@ -25,6 +25,7 @@ import (
 	clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 )
 
 func TestNewFactoryDefaultFlagBindings(t *testing.T) {
@@ -153,3 +154,15 @@ func TestLabelsForObject(t *testing.T) {
 
 	}
 }
+
+func TestFlagUnderscoreRenaming(t *testing.T) {
+	factory := NewFactory(nil)
+
+	factory.flags.SetNormalizeFunc(util.WordSepNormalizeFunc)
+	factory.flags.Bool("valid_flag", false, "bool value")
+
+	// In case of failure of this test check this PR: spf13/pflag#23
+	if factory.flags.Lookup("valid_flag").Name != "valid-flag" {
+		t.Fatalf("Expected flag name to be valid-flag, got %s", factory.flags.Lookup("valid_flag").Name)
+	}
+}
diff --git a/pkg/util/flags.go b/pkg/util/flags.go
index 3d9a9544ccf..fb422c4cc11 100644
--- a/pkg/util/flags.go
+++ b/pkg/util/flags.go
@@ -19,14 +19,24 @@ package util
 import "strings"
 
 import "github.com/spf13/pflag"
+import "github.com/golang/glog"
 
+// WordSepNormalizeFunc changes all flags that contain "_" separators
 func WordSepNormalizeFunc(f *pflag.FlagSet, name string) pflag.NormalizedName {
-	from := []string{"-", "_"}
-	to := "."
-	for _, sep := range from {
-		name = strings.Replace(name, sep, to, -1)
+	if strings.Contains(name, "_") {
+		return pflag.NormalizedName(strings.Replace(name, "_", "-", -1))
+	}
+	return pflag.NormalizedName(name)
+}
+
+// WarnWordSepNormalizeFunc changes and warns for flags that contain "_" separators
+func WarnWordSepNormalizeFunc(f *pflag.FlagSet, name string) pflag.NormalizedName {
+	if strings.Contains(name, "_") {
+		nname := strings.Replace(name, "_", "-", -1)
+		glog.Warningf("%s is DEPRECATED and will be removed in a future version. Use %s instead.", name, nname)
+
+		return pflag.NormalizedName(nname)
 	}
-	// Type convert to indicate normalization has been done.
 	return pflag.NormalizedName(name)
 }
 
diff --git a/pkg/util/pflag_import.go b/pkg/util/pflag_import.go
index 9fdc8799c8f..3e8d4d9ce8c 100644
--- a/pkg/util/pflag_import.go
+++ b/pkg/util/pflag_import.go
@@ -85,23 +85,25 @@ func addFlagToPFlagSet(f *flag.Flag, fs *pflag.FlagSet) {
 	}
 }
 
-// Adds all of the flags in a 'flag.FlagSet' package flags to a 'pflag.FlagSet'.
+// AddFlagSetToPFlagSet adds all of the flags in a 'flag.FlagSet' package flags to a 'pflag.FlagSet'.
 func AddFlagSetToPFlagSet(fsIn *flag.FlagSet, fsOut *pflag.FlagSet) {
 	fsIn.VisitAll(func(f *flag.Flag) {
 		addFlagToPFlagSet(f, fsOut)
 	})
 }
 
-// Add all of the top level 'flag' package flags to the top level 'pflag' flags.
+// AddAllFlagsToPFlags adds all of the top level 'flag' package flags to the top level 'pflag' flags.
 func AddAllFlagsToPFlags() {
 	AddFlagSetToPFlagSet(flag.CommandLine, pflag.CommandLine)
 }
 
-// Merge all of the flags from fsFrom into fsTo.
+// AddPFlagSetToPFlagSet merges the flags of fsFrom into fsTo.
 func AddPFlagSetToPFlagSet(fsFrom *pflag.FlagSet, fsTo *pflag.FlagSet) {
-	fsFrom.VisitAll(func(f *pflag.Flag) {
-		if fsTo.Lookup(f.Name) == nil {
-			fsTo.AddFlag(f)
-		}
-	})
+	if fsFrom != nil && fsTo != nil {
+		fsFrom.VisitAll(func(f *pflag.Flag) {
+			if fsTo.Lookup(f.Name) == nil {
+				fsTo.AddFlag(f)
+			}
+		})
+	}
 }