diff --git a/autocomplete/tunasynctl.bash b/autocomplete/tunasynctl.bash
new file mode 100644
index 0000000..21a232f
--- /dev/null
+++ b/autocomplete/tunasynctl.bash
@@ -0,0 +1,14 @@
+#! /bin/bash
+
+: ${PROG:=$(basename ${BASH_SOURCE})}
+
+_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 $PROG
diff --git a/autocomplete/tunasynctl.zsh b/autocomplete/tunasynctl.zsh
new file mode 100644
index 0000000..4a29412
--- /dev/null
+++ b/autocomplete/tunasynctl.zsh
@@ -0,0 +1,15 @@
+autoload -U compinit && compinit
+autoload -U bashcompinit && bashcompinit
+
+: ${PROG:=$(basename ${BASH_SOURCE})}
+
+_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 $PROG