diff --git a/.gitignore b/.gitignore
index 64cffb9b41..43aa9227e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,8 @@
 .gopath/
 autogen/
 bundles/
-docker/docker
+cmd/dockerd/dockerd
+cmd/docker/docker
 dockerversion/version_autogen.go
 docs/AWS_S3_BUCKET
 docs/GITCOMMIT
diff --git a/client/client.go b/cmd/docker/client.go
similarity index 100%
rename from client/client.go
rename to cmd/docker/client.go
diff --git a/client/client_test.go b/cmd/docker/client_test.go
similarity index 100%
rename from client/client_test.go
rename to cmd/docker/client_test.go
diff --git a/client/daemon.go b/cmd/docker/daemon.go
similarity index 100%
rename from client/daemon.go
rename to cmd/docker/daemon.go
diff --git a/client/daemon_unix.go b/cmd/docker/daemon_unix.go
similarity index 100%
rename from client/daemon_unix.go
rename to cmd/docker/daemon_unix.go
diff --git a/client/daemon_windows.go b/cmd/docker/daemon_windows.go
similarity index 100%
rename from client/daemon_windows.go
rename to cmd/docker/daemon_windows.go
diff --git a/client/daemon_windows_test.go b/cmd/docker/daemon_windows_test.go
similarity index 100%
rename from client/daemon_windows_test.go
rename to cmd/docker/daemon_windows_test.go
diff --git a/client/docker.go b/cmd/docker/docker.go
similarity index 100%
rename from client/docker.go
rename to cmd/docker/docker.go
diff --git a/docker/docker_windows.go b/cmd/docker/docker_windows.go
similarity index 100%
rename from docker/docker_windows.go
rename to cmd/docker/docker_windows.go
diff --git a/client/flags.go b/cmd/docker/flags.go
similarity index 100%
rename from client/flags.go
rename to cmd/docker/flags.go
diff --git a/client/flags_test.go b/cmd/docker/flags_test.go
similarity index 100%
rename from client/flags_test.go
rename to cmd/docker/flags_test.go
diff --git a/docker/README.md b/cmd/dockerd/README.md
similarity index 100%
rename from docker/README.md
rename to cmd/dockerd/README.md
diff --git a/docker/daemon.go b/cmd/dockerd/daemon.go
similarity index 100%
rename from docker/daemon.go
rename to cmd/dockerd/daemon.go
diff --git a/docker/daemon_freebsd.go b/cmd/dockerd/daemon_freebsd.go
similarity index 100%
rename from docker/daemon_freebsd.go
rename to cmd/dockerd/daemon_freebsd.go
diff --git a/docker/daemon_linux.go b/cmd/dockerd/daemon_linux.go
similarity index 100%
rename from docker/daemon_linux.go
rename to cmd/dockerd/daemon_linux.go
diff --git a/docker/daemon_test.go b/cmd/dockerd/daemon_test.go
similarity index 100%
rename from docker/daemon_test.go
rename to cmd/dockerd/daemon_test.go
diff --git a/docker/daemon_unix.go b/cmd/dockerd/daemon_unix.go
similarity index 100%
rename from docker/daemon_unix.go
rename to cmd/dockerd/daemon_unix.go
diff --git a/docker/daemon_unix_test.go b/cmd/dockerd/daemon_unix_test.go
similarity index 100%
rename from docker/daemon_unix_test.go
rename to cmd/dockerd/daemon_unix_test.go
diff --git a/docker/daemon_windows.go b/cmd/dockerd/daemon_windows.go
similarity index 100%
rename from docker/daemon_windows.go
rename to cmd/dockerd/daemon_windows.go
diff --git a/docker/docker.go b/cmd/dockerd/docker.go
similarity index 100%
rename from docker/docker.go
rename to cmd/dockerd/docker.go
diff --git a/client/docker_windows.go b/cmd/dockerd/docker_windows.go
similarity index 100%
rename from client/docker_windows.go
rename to cmd/dockerd/docker_windows.go
diff --git a/hack/.vendor-helpers.sh b/hack/.vendor-helpers.sh
index 2acf8df083..3f075e3494 100755
--- a/hack/.vendor-helpers.sh
+++ b/hack/.vendor-helpers.sh
@@ -75,8 +75,8 @@ _dockerfile_env() {
 
 clean() {
 	local packages=(
-		"${PROJECT}/docker" # daemon package main
-		"${PROJECT}/client" # client package main
+		"${PROJECT}/cmd/dockerd" # daemon package main
+		"${PROJECT}/cmd/docker" # client package main
 		"${PROJECT}/integration-cli" # external tests
 	)
 	local dockerPlatforms=( ${DOCKER_ENGINE_OSARCH:="linux/amd64"} $(_dockerfile_env DOCKER_CROSSPLATFORMS) )
diff --git a/hack/make/binary-client b/hack/make/binary-client
index 6e1f739768..ca4d421f85 100644
--- a/hack/make/binary-client
+++ b/hack/make/binary-client
@@ -3,6 +3,6 @@ set -e
 
 (
 	export BINARY_SHORT_NAME='docker'
-	export SOURCE_PATH='./client'
+	export SOURCE_PATH='./cmd/docker'
 	source "${MAKEDIR}/.binary"
 )
diff --git a/hack/make/binary-daemon b/hack/make/binary-daemon
index 556ca550da..66eba8938f 100644
--- a/hack/make/binary-daemon
+++ b/hack/make/binary-daemon
@@ -3,7 +3,7 @@ set -e
 
 (
 	export BINARY_SHORT_NAME='dockerd'
-	export SOURCE_PATH='./docker'
+	export SOURCE_PATH='./cmd/dockerd'
 	source "${MAKEDIR}/.binary"
 	copy_containerd "$DEST" 'hash'
-)
+)
\ No newline at end of file
diff --git a/hack/make/dynbinary-client b/hack/make/dynbinary-client
index 1c99e2684f..83ae3c4537 100644
--- a/hack/make/dynbinary-client
+++ b/hack/make/dynbinary-client
@@ -3,7 +3,7 @@ set -e
 
 (
 	export BINARY_SHORT_NAME='docker'
-	export SOURCE_PATH='./client'
+	export SOURCE_PATH='./cmd/docker'
 	export IAMSTATIC='false'
 	export LDFLAGS_STATIC_DOCKER=''
 	export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary
diff --git a/hack/make/dynbinary-daemon b/hack/make/dynbinary-daemon
index d8d16ad39e..398b951d85 100644
--- a/hack/make/dynbinary-daemon
+++ b/hack/make/dynbinary-daemon
@@ -3,7 +3,7 @@ set -e
 
 (
 	export BINARY_SHORT_NAME='dockerd'
-	export SOURCE_PATH='./docker'
+	export SOURCE_PATH='./cmd/dockerd'
 	export IAMSTATIC='false'
 	export LDFLAGS_STATIC_DOCKER=''
 	export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary
diff --git a/hack/make/gccgo b/hack/make/gccgo
index a88ae1fd15..93e064a879 100644
--- a/hack/make/gccgo
+++ b/hack/make/gccgo
@@ -24,7 +24,7 @@ go build -compiler=gccgo \
 		-ldl
 		-pthread
 	" \
-	./docker
+	./cmd/dockerd
 
 echo "Created binary: $DEST/$BINARY_FULLNAME"
 ln -sf "$BINARY_FULLNAME" "$DEST/dockerd$BINARY_EXTENSION"
@@ -42,7 +42,7 @@ go build -compiler=gccgo \
 		-ldl
 		-pthread
 	" \
-	./client
+	./cmd/docker
 
 echo "Created binary: $DEST/$CLIENTBIN_FULLNAME"
 ln -sf "$CLIENTBIN_FULLNAME" "$DEST/docker$BINARY_EXTENSION"