diff --git a/deb/common/rules b/deb/common/rules
index 60c3e47f98..f65b84e836 100755
--- a/deb/common/rules
+++ b/deb/common/rules
@@ -27,7 +27,10 @@ override_dh_auto_build:
 	cd engine && TMP_GOPATH="/go" hack/dockerfile/install/install.sh rootlesskit dynamic
 	# Build the CLI
 	cd /go/src/github.com/docker/cli \
-		&& make DISABLE_WARN_OUTSIDE_CONTAINER=1 VERSION=$(VERSION) GITCOMMIT=$(CLI_GITCOMMIT) LDFLAGS='' dynbinary manpages
+		&& make DISABLE_WARN_OUTSIDE_CONTAINER=1 VERSION=$(VERSION) GITCOMMIT=$(CLI_GITCOMMIT) LDFLAGS='' dynbinary manpages \
+		&& build/docker completion bash > contrib/completion/bash/docker \
+		&& build/docker completion zsh > contrib/completion/zsh/_docker \
+		&& build/docker completion fish > contrib/completion/fish/docker.fish
 
 	# Build buildx plugin
 	cd /go/src/github.com/docker/buildx \
diff --git a/rpm/SPECS/docker-ce-cli.spec b/rpm/SPECS/docker-ce-cli.spec
index baa2f35669..daad0cdc0c 100644
--- a/rpm/SPECS/docker-ce-cli.spec
+++ b/rpm/SPECS/docker-ce-cli.spec
@@ -49,6 +49,9 @@ rm -f /go/src/github.com/docker/cli
 ln -snf ${RPM_BUILD_DIR}/src/cli /go/src/github.com/docker/cli
 pushd /go/src/github.com/docker/cli
 make DISABLE_WARN_OUTSIDE_CONTAINER=1 VERSION=%{_origversion} GITCOMMIT=%{_gitcommit_cli} dynbinary manpages
+build/docker completion bash > contrib/completion/bash/docker
+build/docker completion zsh > contrib/completion/zsh/_docker
+build/docker completion fish > contrib/completion/fish/docker.fish
 popd
 
 %check