diff --git a/contrib/completion/bash_autocomplete b/contrib/completion/bash_autocomplete
new file mode 100644
index 0000000..f757959
--- /dev/null
+++ b/contrib/completion/bash_autocomplete
@@ -0,0 +1,12 @@
+#! /bin/bash
+
+_cli_bash_autocomplete() {
+     local cur opts base
+     COMPREPLY=()
+     cur="${COMP_WORDS[COMP_CWORD]}"
+     opts=$( ${COMP_WORDS[@]:0:$COMP_CWORD} --generate-bash-completion )
+     COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+     return 0
+ }
+
+complete -F _cli_bash_autocomplete gotty-client
diff --git a/contrib/completion/zsh_autocomplete b/contrib/completion/zsh_autocomplete
new file mode 100644
index 0000000..de08715
--- /dev/null
+++ b/contrib/completion/zsh_autocomplete
@@ -0,0 +1,13 @@
+autoload -U compinit && compinit
+autoload -U bashcompinit && bashcompinit
+
+_cli_bash_autocomplete() {
+     local cur opts base
+     COMPREPLY=()
+     cur="${COMP_WORDS[COMP_CWORD]}"
+     opts=$( ${COMP_WORDS[@]:0:$COMP_CWORD} --generate-bash-completion )
+     COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+     return 0
+ }
+
+complete -F _cli_bash_autocomplete gotty-client