diff --git a/build/deb/ethereum/completions/bash_autocomplete b/build/deb/ethereum/completions/bash_autocomplete
old mode 100644
new mode 100755
index f0f624183bd0..a78952793efb
--- a/build/deb/ethereum/completions/bash_autocomplete
+++ b/build/deb/ethereum/completions/bash_autocomplete
@@ -1,8 +1,4 @@
-#! /bin/bash
-
-: ${PROG:=$(basename ${BASH_SOURCE})}
-
-_cli_bash_autocomplete() {
+_geth_bash_autocomplete() {
   if [[ "${COMP_WORDS[0]}" != "source" ]]; then
     local cur opts base
     COMPREPLY=()
@@ -17,5 +13,4 @@ _cli_bash_autocomplete() {
   fi
 }
 
-complete -o bashdefault -o default -o nospace -F _cli_bash_autocomplete $PROG
-unset PROG
+complete -o bashdefault -o default -o nospace -F _geth_bash_autocomplete geth
diff --git a/build/deb/ethereum/completions/zsh_autocomplete b/build/deb/ethereum/completions/zsh_autocomplete
index b519666f809c..119794c532bd 100644
--- a/build/deb/ethereum/completions/zsh_autocomplete
+++ b/build/deb/ethereum/completions/zsh_autocomplete
@@ -1,6 +1,4 @@
-#compdef $PROG
-
-_cli_zsh_autocomplete() {
+_geth_zsh_autocomplete() {
   local -a opts
   local cur
   cur=${words[-1]}
@@ -17,4 +15,4 @@ _cli_zsh_autocomplete() {
   fi
 }
 
-compdef _cli_zsh_autocomplete $PROG
+compdef _geth_zsh_autocomplete geth
diff --git a/build/deb/ethereum/deb.install b/build/deb/ethereum/deb.install
index e7666ce5fb6b..e8496e7eade2 100644
--- a/build/deb/ethereum/deb.install
+++ b/build/deb/ethereum/deb.install
@@ -1 +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
+{{end -}}