diff --git a/bash_completion b/bash_completion
index 3f2c6f8..17d0192 100644
--- a/bash_completion
+++ b/bash_completion
@@ -9,7 +9,7 @@ function _bkctld()
 
 	cur=${COMP_WORDS[COMP_CWORD]};
 	prev=${COMP_WORDS[COMP_CWORD-1]};
-	commands="init update remove start stop reload restart sync status key port ip inc rm check stats"
+	commands=$(find /usr/lib/bkctld/ -name "bkctld-*" -exec basename {} \;|sed 's/^bkctld-//')
 
 	if [ $COMP_CWORD -eq 1 ]; then
 		COMPREPLY=($(compgen -W '${commands}' -- ${cur}))