diff --git a/completion/zpkg.bash b/completion/zpkg.bash
index d3a805f..0f93d23 100644
--- a/completion/zpkg.bash
+++ b/completion/zpkg.bash
@@ -13,7 +13,7 @@ _zpkg_completion()
   elif [ "$COMP_CWORD" -gt "1" ] && echo "$_cw1_pkg_installed" | grep -qw -- "${COMP_WORDS[1]}" ; then
     _compwords=$(zpkg list 2>/dev/null)
   fi
-  COMPREPLY=($(compgen -W "$_compwords" "${COMP_WORDS[$COMP_CWORD]}" 2>/dev/null))
+  COMPREPLY=($(compgen -W "$_compwords" "$2" 2>/dev/null))
 }
 
 complete -F _zpkg_completion -o dirnames zpkg
diff --git a/scripts/server_deploy.sh b/scripts/server_deploy.sh
index d322625..be3581d 100755
--- a/scripts/server_deploy.sh
+++ b/scripts/server_deploy.sh
@@ -26,14 +26,14 @@ scp .zpkgconfig server_scripts/* "$SSH_ADDRESS":~/ || exit $?
 # env
 PKG=zpkg
 DEST=/usr/bin
-BASHDEST=/etc/bash_completion.d
+BASHDEST=/usr/share/bash-completion/completions
 tmpdir="$TMPDIR/zpkg$(random_string 5)"
 fullpath="$tmpdir/$PKG/ROOT"
 
 # setup package sources
 mkdir -p "$fullpath$DEST" || exit $?
 mkdir -p "$fullpath$BASHDEST" || exit $?
-cp completion/zpkg.bash "$fullpath$BASHDEST" || exit $?
+cp completion/zpkg.bash "$fullpath$BASHDEST/zpkg" || exit $?
 mv zpkg "$fullpath$DEST" || exit $?
 
 # create and send package