diff --git a/api/client/build.go b/api/client/build.go
index 6dac4a3f3..f424e9b3f 100644
--- a/api/client/build.go
+++ b/api/client/build.go
@@ -392,7 +392,7 @@ func getContextFromReader(r io.Reader, dockerfileName string) (absContextDir, re
 	}
 
 	if err := archive.Untar(buf, absContextDir, nil); err != nil {
-		return "", "", fmt.Errorf("unable to extract stdin to temporary context direcotry: %v", err)
+		return "", "", fmt.Errorf("unable to extract stdin to temporary context directory: %v", err)
 	}
 
 	return getDockerfileRelPath(absContextDir, dockerfileName)
diff --git a/integration-cli/docker_cli_cp_from_container_test.go b/integration-cli/docker_cli_cp_from_container_test.go
index 14536ce85..3dc8bab19 100644
--- a/integration-cli/docker_cli_cp_from_container_test.go
+++ b/integration-cli/docker_cli_cp_from_container_test.go
@@ -427,7 +427,7 @@ func (s *DockerSuite) TestCpFromCaseH(c *check.C) {
 	}
 }
 
-// I. SRC specifies a direcotry's contents only and DST exists as a file. This
+// I. SRC specifies a directory's contents only and DST exists as a file. This
 //    should cause an error as it is not possible to overwrite a file with a
 //    directory.
 func (s *DockerSuite) TestCpFromCaseI(c *check.C) {
diff --git a/integration-cli/docker_cli_cp_to_container_test.go b/integration-cli/docker_cli_cp_to_container_test.go
index 4179553d1..a924c5614 100644
--- a/integration-cli/docker_cli_cp_to_container_test.go
+++ b/integration-cli/docker_cli_cp_to_container_test.go
@@ -484,7 +484,7 @@ func (s *DockerSuite) TestCpToCaseH(c *check.C) {
 	}
 }
 
-// I. SRC specifies a direcotry's contents only and DST exists as a file. This
+// I. SRC specifies a directory's contents only and DST exists as a file. This
 //    should cause an error as it is not possible to overwrite a file with a
 //    directory.
 func (s *DockerSuite) TestCpToCaseI(c *check.C) {
diff --git a/pkg/archive/copy_test.go b/pkg/archive/copy_test.go
index d0cfa18bd..dd0b32362 100644
--- a/pkg/archive/copy_test.go
+++ b/pkg/archive/copy_test.go
@@ -565,7 +565,7 @@ func TestCopyCaseH(t *testing.T) {
 	}
 }
 
-// I. SRC specifies a direcotry's contents only and DST exists as a file. This
+// I. SRC specifies a directory's contents only and DST exists as a file. This
 //    should cause an error as it is not possible to overwrite a file with a
 //    directory.
 func TestCopyCaseI(t *testing.T) {