diff --git a/build/deb/ethereum/completions/bash_autocomplete b/build/deb/ethereum/completions/bash/geth
similarity index 100%
rename from build/deb/ethereum/completions/bash_autocomplete
rename to build/deb/ethereum/completions/bash/geth
diff --git a/build/deb/ethereum/completions/zsh_autocomplete b/build/deb/ethereum/completions/zsh/_geth
similarity index 100%
rename from build/deb/ethereum/completions/zsh_autocomplete
rename to build/deb/ethereum/completions/zsh/_geth
diff --git a/build/deb/ethereum/deb.install b/build/deb/ethereum/deb.install
index 019bd0f4bb3fa..5a624594b06ca 100644
--- a/build/deb/ethereum/deb.install
+++ b/build/deb/ethereum/deb.install
@@ -1,5 +1,5 @@
 build/bin/{{.BinaryName}} usr/bin
 {{- if eq .BinaryName "geth" }}
-build/deb/ethereum/completions/bash_autocomplete etc/bash_completion.d/geth
-build/deb/ethereum/completions/zsh_autocomplete usr/share/zsh/vendor-completions/_geth
+build/deb/ethereum/completions/bash/geth etc/bash_completion.d
+build/deb/ethereum/completions/zsh/_geth usr/share/zsh/vendor-completions
 {{end -}}