diff --git a/cmd/kubeadm/app/cmd/phases/BUILD b/cmd/kubeadm/app/cmd/phases/BUILD
index 24def1c2889..472b487e6a1 100644
--- a/cmd/kubeadm/app/cmd/phases/BUILD
+++ b/cmd/kubeadm/app/cmd/phases/BUILD
@@ -57,6 +57,7 @@ go_library(
         "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
         "//staging/src/k8s.io/cluster-bootstrap/token/api:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
+        "//vendor/github.com/pkg/errors:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",
         "//vendor/k8s.io/utils/exec:go_default_library",
diff --git a/docs/.generated_docs b/docs/.generated_docs
index fd8a3adc7f7..d47c6ab73bf 100644
--- a/docs/.generated_docs
+++ b/docs/.generated_docs
@@ -60,8 +60,6 @@ docs/admin/kubeadm_alpha_phase_kubelet_config_annotate-cri.md
 docs/admin/kubeadm_alpha_phase_kubelet_config_download.md
 docs/admin/kubeadm_alpha_phase_kubelet_config_enable-dynamic.md
 docs/admin/kubeadm_alpha_phase_kubelet_config_upload.md
-docs/admin/kubeadm_alpha_phase_kubelet_config_write-to-disk.md
-docs/admin/kubeadm_alpha_phase_kubelet_write-env-file.md
 docs/admin/kubeadm_alpha_phase_mark-master.md
 docs/admin/kubeadm_alpha_phase_preflight.md
 docs/admin/kubeadm_alpha_phase_preflight_node.md
@@ -83,6 +81,7 @@ docs/admin/kubeadm_config_upload_from-flags.md
 docs/admin/kubeadm_config_view.md
 docs/admin/kubeadm_init.md
 docs/admin/kubeadm_init_phase.md
+docs/admin/kubeadm_init_phase_kubelet-start.md
 docs/admin/kubeadm_init_phase_preflight.md
 docs/admin/kubeadm_join.md
 docs/admin/kubeadm_reset.md
@@ -156,9 +155,7 @@ docs/man/man1/kubeadm-alpha-phase-kubelet-config-annotate-cri.1
 docs/man/man1/kubeadm-alpha-phase-kubelet-config-download.1
 docs/man/man1/kubeadm-alpha-phase-kubelet-config-enable-dynamic.1
 docs/man/man1/kubeadm-alpha-phase-kubelet-config-upload.1
-docs/man/man1/kubeadm-alpha-phase-kubelet-config-write-to-disk.1
 docs/man/man1/kubeadm-alpha-phase-kubelet-config.1
-docs/man/man1/kubeadm-alpha-phase-kubelet-write-env-file.1
 docs/man/man1/kubeadm-alpha-phase-kubelet.1
 docs/man/man1/kubeadm-alpha-phase-mark-master.1
 docs/man/man1/kubeadm-alpha-phase-preflight-node.1
@@ -182,6 +179,7 @@ docs/man/man1/kubeadm-config-upload-from-flags.1
 docs/man/man1/kubeadm-config-upload.1
 docs/man/man1/kubeadm-config-view.1
 docs/man/man1/kubeadm-config.1
+docs/man/man1/kubeadm-init-phase-kubelet-start.1
 docs/man/man1/kubeadm-init-phase-preflight.1
 docs/man/man1/kubeadm-init-phase.1
 docs/man/man1/kubeadm-init.1
diff --git a/docs/admin/kubeadm_alpha_phase_kubelet_config_write-to-disk.md b/docs/admin/kubeadm_init_phase_kubelet-start.md
similarity index 100%
rename from docs/admin/kubeadm_alpha_phase_kubelet_config_write-to-disk.md
rename to docs/admin/kubeadm_init_phase_kubelet-start.md
diff --git a/docs/man/man1/kubeadm-alpha-phase-kubelet-config-write-to-disk.1 b/docs/man/man1/kubeadm-alpha-phase-kubelet-config-write-to-disk.1
deleted file mode 100644
index b6fd7a0f989..00000000000
--- a/docs/man/man1/kubeadm-alpha-phase-kubelet-config-write-to-disk.1
+++ /dev/null
@@ -1,3 +0,0 @@
-This file is autogenerated, but we've stopped checking such files into the
-repository to reduce the need for rebases. Please run hack/generate-docs.sh to
-populate this file.
diff --git a/docs/man/man1/kubeadm-alpha-phase-kubelet-write-env-file.1 b/docs/man/man1/kubeadm-alpha-phase-kubelet-write-env-file.1
deleted file mode 100644
index b6fd7a0f989..00000000000
--- a/docs/man/man1/kubeadm-alpha-phase-kubelet-write-env-file.1
+++ /dev/null
@@ -1,3 +0,0 @@
-This file is autogenerated, but we've stopped checking such files into the
-repository to reduce the need for rebases. Please run hack/generate-docs.sh to
-populate this file.
diff --git a/docs/admin/kubeadm_alpha_phase_kubelet_write-env-file.md b/docs/man/man1/kubeadm-init-phase-kubelet-start.1
similarity index 100%
rename from docs/admin/kubeadm_alpha_phase_kubelet_write-env-file.md
rename to docs/man/man1/kubeadm-init-phase-kubelet-start.1