diff --git a/api/client/stack/opts.go b/api/client/stack/opts.go
index 8a1624cfc5b38831b79564cc17d58133432603e3..f13732efbe245de967b3152ebf95523c738c0f58 100644
--- a/api/client/stack/opts.go
+++ b/api/client/stack/opts.go
@@ -14,7 +14,7 @@ import (
 func addBundlefileFlag(opt *string, flags *pflag.FlagSet) {
 	flags.StringVar(
 		opt,
-		"bundle", "",
+		"file", "",
 		"Path to a Distributed Application Bundle file (Default: STACK.dab)")
 }
 
@@ -26,7 +26,7 @@ func loadBundlefile(stderr io.Writer, namespace string, path string) (*bundlefil
 	}
 	if _, err := os.Stat(path); err != nil {
 		return nil, fmt.Errorf(
-			"Bundle %s not found. Specify the path with -f or --bundle",
+			"Bundle %s not found. Specify the path with --file",
 			path)
 	}
 
diff --git a/docs/reference/commandline/deploy.md b/docs/reference/commandline/deploy.md
index 34d39c506132267654f673acfae4b90b247d2541..59314e4a8d17cef8b9b951318deea4137a5091a4 100644
--- a/docs/reference/commandline/deploy.md
+++ b/docs/reference/commandline/deploy.md
@@ -17,7 +17,7 @@ Usage:  docker deploy [OPTIONS] STACK
 Create and update a stack from a Distributed Application Bundle (DAB)
 
 Options:
-      --bundle string   Path to a Distributed Application Bundle file (Default: STACK.dab)
+      --file   string   Path to a Distributed Application Bundle file (Default: STACK.dab)
       --help            Print usage
 ```
 
diff --git a/docs/reference/commandline/stack_config.md b/docs/reference/commandline/stack_config.md
index c9292bd686feb20716b61be0694aa6fa7623402b..ba990aea98be189950ff1aa5e29bfb0cbf3d2052 100644
--- a/docs/reference/commandline/stack_config.md
+++ b/docs/reference/commandline/stack_config.md
@@ -17,7 +17,7 @@ Usage:  docker stack config [OPTIONS] STACK
 Print the stack configuration
 
 Options:
-      --bundle string   Path to a Distributed Application Bundle file (Default: STACK.dab)
+      --file   string   Path to a Distributed Application Bundle file (Default: STACK.dab)
       --help            Print usage
 ```
 
diff --git a/docs/reference/commandline/stack_deploy.md b/docs/reference/commandline/stack_deploy.md
index a519b5b67e4abfd951f33f262247a627ea9f7ea3..541882e2ac24497cfb7a57401f5e25a7de5cf14c 100644
--- a/docs/reference/commandline/stack_deploy.md
+++ b/docs/reference/commandline/stack_deploy.md
@@ -20,7 +20,7 @@ Aliases:
   deploy, up
 
 Options:
-      --bundle string   Path to a Distributed Application Bundle file (Default: STACK.dab)
+      --file   string   Path to a Distributed Application Bundle file (Default: STACK.dab)
       --help            Print usage
 ```
 
diff --git a/experimental/docker-stacks-and-bundles.md b/experimental/docker-stacks-and-bundles.md
index 1da2b8f587f845aef5f4d77e865c628f653a7cc9..93e92fe2f1fa3d8898c5cb7908a93d8eb43d749c 100644
--- a/experimental/docker-stacks-and-bundles.md
+++ b/experimental/docker-stacks-and-bundles.md
@@ -44,7 +44,7 @@ Usage:  docker deploy [OPTIONS] STACK
 Create and update a stack
 
 Options:
-  -f, --bundle string   Path to a bundle (Default: STACK.dab)
+      --file   string   Path to a Distributed Application Bundle file (Default: STACK.dab)
       --help            Print usage
 ```