diff --git a/components/engine/commands.go b/components/engine/commands.go
index 8112af021f..5333ec40c3 100644
--- a/components/engine/commands.go
+++ b/components/engine/commands.go
@@ -53,7 +53,7 @@ func ParseCommands(addr string, port int, args ...string) error {
 }
 
 func (cli *DockerCli) CmdHelp(args ...string) error {
-	help := fmt.Sprintf("Usage: docker [OPTIONS] COMMAND [arg...]\n  -h=\"%s:%d\": Host:port to bind/connect to\n\nA self-sufficient runtime for linux containers.\n\nCommands:\n", cli.addr, cli.port)
+	help := fmt.Sprintf("Usage: docker [OPTIONS] COMMAND [arg...]\n  -H=\"%s:%d\": Host:port to bind/connect to\n\nA self-sufficient runtime for linux containers.\n\nCommands:\n", cli.addr, cli.port)
 	for cmd, description := range map[string]string{
 		"attach":  "Attach to a running container",
 		"build":   "Build a container from Dockerfile or via stdin",
diff --git a/components/engine/docker/docker.go b/components/engine/docker/docker.go
index f2dca2de14..28b4d7f927 100644
--- a/components/engine/docker/docker.go
+++ b/components/engine/docker/docker.go
@@ -32,7 +32,7 @@ func main() {
 	flAutoRestart := flag.Bool("r", false, "Restart previously running containers")
 	bridgeName := flag.String("b", "", "Attach containers to a pre-existing network bridge")
 	pidfile := flag.String("p", "/var/run/docker.pid", "File containing process PID")
-	flHost := flag.String("h", fmt.Sprintf("%s:%d", host, port), "Host:port to bind/connect to")
+	flHost := flag.String("H", fmt.Sprintf("%s:%d", host, port), "Host:port to bind/connect to")
 	flag.Parse()
 	if *bridgeName != "" {
 		docker.NetworkBridgeIface = *bridgeName
diff --git a/components/engine/docs/sources/commandline/cli.rst b/components/engine/docs/sources/commandline/cli.rst
index 3bb904b46a..02691b4f56 100644
--- a/components/engine/docs/sources/commandline/cli.rst
+++ b/components/engine/docs/sources/commandline/cli.rst
@@ -15,7 +15,7 @@ To list available commands, either run ``docker`` with no parameters or execute
 
   $ docker
     Usage: docker [OPTIONS] COMMAND [arg...]
-      -h="127.0.0.1:4243": Host:port to bind/connect to
+      -H="127.0.0.1:4243": Host:port to bind/connect to
 
     A self-sufficient runtime for linux containers.
 
diff --git a/components/engine/docs/sources/use/basics.rst b/components/engine/docs/sources/use/basics.rst
index 4c450fbc97..378028703c 100644
--- a/components/engine/docs/sources/use/basics.rst
+++ b/components/engine/docs/sources/use/basics.rst
@@ -42,9 +42,9 @@ use -host and -port on both deamon and client
 .. code-block:: bash
 
    # Run docker in daemon mode
-   sudo <path to>/docker -h 0.0.0.0:5555 &
+   sudo <path to>/docker -H 0.0.0.0:5555 &
    # Download a base image
-   docker -h :5555 pull base
+   docker -H :5555 pull base
 
 
 Starting a long-running worker process