diff --git a/.generated_docs b/.generated_docs
index e65b62c37f2..b0742ad1e38 100644
--- a/.generated_docs
+++ b/.generated_docs
@@ -75,5 +75,4 @@ docs/user-guide/kubectl/kubectl_replace.md
 docs/user-guide/kubectl/kubectl_rolling-update.md
 docs/user-guide/kubectl/kubectl_run.md
 docs/user-guide/kubectl/kubectl_scale.md
-docs/user-guide/kubectl/kubectl_stop.md
 docs/user-guide/kubectl/kubectl_version.md
diff --git a/contrib/completions/bash/kubectl b/contrib/completions/bash/kubectl
index 124ed7367cd..22cfcfc5a3b 100644
--- a/contrib/completions/bash/kubectl
+++ b/contrib/completions/bash/kubectl
@@ -787,35 +787,6 @@ _kubectl_run()
     must_have_one_noun=()
 }
 
-_kubectl_stop()
-{
-    last_command="kubectl_stop"
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--all")
-    flags+=("--filename=")
-    flags_with_completion+=("--filename")
-    flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
-    two_word_flags+=("-f")
-    flags_with_completion+=("-f")
-    flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
-    flags+=("--grace-period=")
-    flags+=("--ignore-not-found")
-    flags+=("--output=")
-    two_word_flags+=("-o")
-    flags+=("--selector=")
-    two_word_flags+=("-l")
-    flags+=("--timeout=")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-}
-
 _kubectl_expose()
 {
     last_command="kubectl_expose"
@@ -1265,7 +1236,6 @@ _kubectl()
     commands+=("port-forward")
     commands+=("proxy")
     commands+=("run")
-    commands+=("stop")
     commands+=("expose")
     commands+=("autoscale")
     commands+=("label")
diff --git a/docs/user-guide/kubectl/kubectl.md b/docs/user-guide/kubectl/kubectl.md
index 8718e1f2321..8609019a56b 100644
--- a/docs/user-guide/kubectl/kubectl.md
+++ b/docs/user-guide/kubectl/kubectl.md
@@ -102,7 +102,6 @@ kubectl
 * [kubectl rolling-update](kubectl_rolling-update.md)	 - Perform a rolling update of the given ReplicationController.
 * [kubectl run](kubectl_run.md)	 - Run a particular image on the cluster.
 * [kubectl scale](kubectl_scale.md)	 - Set a new size for a Replication Controller.
-* [kubectl stop](kubectl_stop.md)	 - Deprecated: Gracefully shut down a resource by name or filename.
 * [kubectl version](kubectl_version.md)	 - Print the client and server version information.
 
 ###### Auto generated by spf13/cobra on 24-Nov-2015
diff --git a/pkg/kubectl/cmd/stop.go b/pkg/kubectl/cmd/stop.go
index 3919c22e12a..c6673fa481e 100644
--- a/pkg/kubectl/cmd/stop.go
+++ b/pkg/kubectl/cmd/stop.go
@@ -17,6 +17,7 @@ limitations under the License.
 package cmd
 
 import (
+	"fmt"
 	"io"
 
 	"github.com/spf13/cobra"
@@ -56,10 +57,11 @@ func NewCmdStop(f *cmdutil.Factory, out io.Writer) *cobra.Command {
 	options := &StopOptions{}
 
 	cmd := &cobra.Command{
-		Use:     "stop (-f FILENAME | TYPE (NAME | -l label | --all))",
-		Short:   "Deprecated: Gracefully shut down a resource by name or filename.",
-		Long:    stop_long,
-		Example: stop_example,
+		Use:        "stop (-f FILENAME | TYPE (NAME | -l label | --all))",
+		Short:      "Deprecated: Gracefully shut down a resource by name or filename.",
+		Long:       stop_long,
+		Example:    stop_example,
+		Deprecated: fmt.Sprintf("use %q instead.", "delete"),
 		Run: func(cmd *cobra.Command, args []string) {
 			cmdutil.CheckErr(cmdutil.ValidateOutputArgs(cmd))
 			cmdutil.CheckErr(RunStop(f, cmd, args, out, options))