diff --git a/api/client/commands.go b/api/client/commands.go
index 67c5aec2dc..6080595849 100644
--- a/api/client/commands.go
+++ b/api/client/commands.go
@@ -47,7 +47,7 @@ func (cli *DockerCli) CmdHelp(args ...string) error {
 	help := fmt.Sprintf("Usage: docker [OPTIONS] COMMAND [arg...]\n -H=[unix://%s]: tcp://host:port to bind/connect to or unix://path/to/socket to use\n\nA self-sufficient runtime for linux containers.\n\nCommands:\n", api.DEFAULTUNIXSOCKET)
 	for _, command := range [][]string{
 		{"attach", "Attach to a running container"},
-		{"build", "Build a container from a Dockerfile"},
+		{"build", "Build an image from a Dockerfile"},
 		{"commit", "Create a new image from a container's changes"},
 		{"cp", "Copy files/folders from the containers filesystem to the host path"},
 		{"diff", "Inspect changes on a container's filesystem"},
@@ -105,7 +105,7 @@ func (cli *DockerCli) CmdInsert(args ...string) error {
 }
 
 func (cli *DockerCli) CmdBuild(args ...string) error {
-	cmd := cli.Subcmd("build", "[OPTIONS] PATH | URL | -", "Build a new container image from the source code at PATH")
+	cmd := cli.Subcmd("build", "[OPTIONS] PATH | URL | -", "Build a new image from the source code at PATH")
 	tag := cmd.String([]string{"t", "-tag"}, "", "Repository name (and optionally a tag) to be applied to the resulting image in case of success")
 	suppressOutput := cmd.Bool([]string{"q", "-quiet"}, false, "Suppress the verbose output generated by the containers")
 	noCache := cmd.Bool([]string{"#no-cache", "-no-cache"}, false, "Do not use cache when building the image")
diff --git a/contrib/completion/fish/docker.fish b/contrib/completion/fish/docker.fish
index e3bb72aebe..7ea478d051 100644
--- a/contrib/completion/fish/docker.fish
+++ b/contrib/completion/fish/docker.fish
@@ -71,7 +71,7 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from attach' -l sig-proxy -d
 complete -c docker -A -f -n '__fish_seen_subcommand_from attach' -a '(__fish_print_docker_containers running)' -d "Container"
 
 # build
-complete -c docker -f -n '__fish_docker_no_subcommand' -a build -d 'Build a container from a Dockerfile'
+complete -c docker -f -n '__fish_docker_no_subcommand' -a build -d 'Build an image from a Dockerfile'
 complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l no-cache -d 'Do not use cache when building the image'
 complete -c docker -A -f -n '__fish_seen_subcommand_from build' -s q -l quiet -d 'Suppress the verbose output generated by the containers'
 complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l rm -d 'Remove intermediate containers after a successful build'
diff --git a/contrib/man/md/docker-build.1.md b/contrib/man/md/docker-build.1.md
index b3e9a2842e..b01bb9f8b7 100644
--- a/contrib/man/md/docker-build.1.md
+++ b/contrib/man/md/docker-build.1.md
@@ -2,7 +2,7 @@
 % William Henry
 % APRIL 2014
 # NAME
-docker-build - Build a container image from a Dockerfile source at PATH
+docker-build - Build an image from a Dockerfile source at PATH
 
 # SYNOPSIS
 **docker build** [**--no-cache**[=*false*]] [**-q**|**--quiet**[=*false*]]
diff --git a/contrib/man/md/docker.1.md b/contrib/man/md/docker.1.md
index 0071a71c92..c73b083e61 100644
--- a/contrib/man/md/docker.1.md
+++ b/contrib/man/md/docker.1.md
@@ -81,7 +81,7 @@ port=[4243] or path =[/var/run/docker.sock] is omitted, default values are used.
   Attach to a running container
 
 **docker-build(1)**
-  Build a container from a Dockerfile
+  Build an image from a Dockerfile
 
 **docker-commit(1)**
   Create a new image from a container's changes
diff --git a/contrib/man/old-man/docker-build.1 b/contrib/man/old-man/docker-build.1
index 6546b7be2a..2d189eb0e3 100644
--- a/contrib/man/old-man/docker-build.1
+++ b/contrib/man/old-man/docker-build.1
@@ -3,7 +3,7 @@
 .\"
 .TH "DOCKER" "1" "MARCH 2014" "0.1" "Docker"
 .SH NAME
-docker-build \- Build a container image from a Dockerfile source at PATH
+docker-build \- Build an image from a Dockerfile source at PATH
 .SH SYNOPSIS
 .B docker build 
 [\fB--no-cache\fR[=\fIfalse\fR] 
diff --git a/contrib/man/old-man/docker.1 b/contrib/man/old-man/docker.1
index 4a36e5baf5..5a55865120 100644
--- a/contrib/man/old-man/docker.1
+++ b/contrib/man/old-man/docker.1
@@ -69,7 +69,7 @@ Print version information and quit
 Attach to a running container
 .TP
 .B build 
-Build a container from a Dockerfile
+Build an image from a Dockerfile
 .TP
 .B commit 
 Create a new image from a container's changes
diff --git a/docs/sources/examples/cfengine_process_management.md b/docs/sources/examples/cfengine_process_management.md
index 0c7b6a8a1f..ee5ba238a0 100644
--- a/docs/sources/examples/cfengine_process_management.md
+++ b/docs/sources/examples/cfengine_process_management.md
@@ -58,7 +58,7 @@ There are three steps:
    containerized CFEngine installation.
 3. Start your application processes as part of the `docker run` command.
 
-### Building the container image
+### Building the image
 
 The first two steps can be done as part of a Dockerfile, as follows.
 
@@ -87,7 +87,7 @@ The first two steps can be done as part of a Dockerfile, as follows.
     ENTRYPOINT ["/var/cfengine/bin/docker_processes_run.sh"]
 
 By saving this file as Dockerfile to a working directory, you can then build
-your container with the docker build command, e.g.
+your image with the docker build command, e.g.
 `docker build -t managed_image`.
 
 ### Testing the container
diff --git a/docs/sources/examples/using_supervisord.md b/docs/sources/examples/using_supervisord.md
index 6fc47b0c03..0f10945325 100644
--- a/docs/sources/examples/using_supervisord.md
+++ b/docs/sources/examples/using_supervisord.md
@@ -95,9 +95,9 @@ Here We've exposed ports 22 and 80 on the container and we're running
 the `/usr/bin/supervisord` binary when the container
 launches.
 
-## Building our container
+## Building our image
 
-We can now build our new container.
+We can now build our new image.
 
     $ sudo docker build -t <yourname>/supervisord .
 
diff --git a/docs/sources/introduction/working-with-docker.md b/docs/sources/introduction/working-with-docker.md
index 1abee1ce34..aefdc586c0 100644
--- a/docs/sources/introduction/working-with-docker.md
+++ b/docs/sources/introduction/working-with-docker.md
@@ -83,7 +83,7 @@ You will see a list of all currently available commands.
 
     Commands:
          attach    Attach to a running container
-         build     Build a container from a Dockerfile
+         build     Build an image from a Dockerfile
          commit    Create a new image from a container's changes
     . . .
 
diff --git a/docs/sources/reference/api/README.md b/docs/sources/reference/api/README.md
index a7b8ae1b44..ec1cbcb2c3 100644
--- a/docs/sources/reference/api/README.md
+++ b/docs/sources/reference/api/README.md
@@ -2,7 +2,7 @@ This directory holds the authoritative specifications of APIs defined and implem
 
  * The remote API by which a docker node can be queried over HTTP
  * The registry API by which a docker node can download and upload
-   container images for storage and sharing
+   images for storage and sharing
  * The index search API by which a docker node can search the public
    index for images to download
  * The docker.io OAuth and accounts API which 3rd party services can
diff --git a/docs/sources/reference/commandline/cli.md b/docs/sources/reference/commandline/cli.md
index e0c5eb1069..8325bc794f 100644
--- a/docs/sources/reference/commandline/cli.md
+++ b/docs/sources/reference/commandline/cli.md
@@ -190,7 +190,7 @@ To kill the container, use `docker kill`.
 
     Usage: docker build [OPTIONS] PATH | URL | -
 
-    Build a new container image from the source code at PATH
+    Build a new image from the source code at PATH
 
       --force-rm=false     Always remove intermediate containers, even after unsuccessful builds
       --no-cache=false     Do not use cache when building the image
diff --git a/docs/sources/use/basics.md b/docs/sources/use/basics.md
index e4422034d4..1b8c0a7b1d 100644
--- a/docs/sources/use/basics.md
+++ b/docs/sources/use/basics.md
@@ -157,7 +157,7 @@ TCP and a Unix socket
 
 ## Committing (saving) a container state
 
-Save your containers state to a container image, so the state can be
+Save your containers state to an image, so the state can be
 re-used.
 
 When you commit your container only the differences between the image
@@ -171,7 +171,7 @@ will be stored (as a diff). See which images you already have using the
     # List your containers
     $ sudo docker images
 
-You now have a image state from which you can create new instances.
+You now have an image state from which you can create new instances.
 
 Read more about [*Share Images via Repositories*](
 ../workingwithrepository/#working-with-the-repository) or
diff --git a/hack/RELEASE-CHECKLIST.md b/hack/RELEASE-CHECKLIST.md
index 31f0adb757..583328b46d 100644
--- a/hack/RELEASE-CHECKLIST.md
+++ b/hack/RELEASE-CHECKLIST.md
@@ -70,7 +70,7 @@ EXAMPLES:
 
 #### Builder
 
-+ 'docker build -t FOO .' applies the tag FOO to the newly built container
++ 'docker build -t FOO .' applies the tag FOO to the newly built image
 
 #### Remote API
 
diff --git a/hack/make.sh b/hack/make.sh
index 8636756c87..e7dc09cfbe 100755
--- a/hack/make.sh
+++ b/hack/make.sh
@@ -18,7 +18,7 @@ set -e
 # - The right way to call this script is to invoke "make" from
 #   your checkout of the Docker repository.
 #   the Makefile will do a "docker build -t docker ." and then
-#   "docker run hack/make.sh" in the resulting container image.
+#   "docker run hack/make.sh" in the resulting image.
 #
 
 set -o pipefail