diff --git a/rcrc b/rcrc
index 1178538..1f16a08 100644
--- a/rcrc
+++ b/rcrc
@@ -1,4 +1,4 @@
 DOTFILES_DIRS="$HOME/dotfiles-local $HOME/dotfiles"
 EXCLUDES="install.sh README.md"
-SYMLINK_DIRS="composer bin functions configs"
+SYMLINK_DIRS="completion-scripts composer bin functions configs"
 TAGS="git npm php tmux vim zsh"
diff --git a/tag-zsh/zsh/completion-scripts/_g b/tag-zsh/zsh/completion-scripts/_g
new file mode 100644
index 0000000..4eca8f3
--- /dev/null
+++ b/tag-zsh/zsh/completion-scripts/_g
@@ -0,0 +1,3 @@
+#compdef g
+compdef g=git
+
diff --git a/tag-zsh/zsh/configs/post/completion.zsh b/tag-zsh/zsh/configs/post/completion.zsh
index 4a7917b..e494ff6 100644
--- a/tag-zsh/zsh/configs/post/completion.zsh
+++ b/tag-zsh/zsh/configs/post/completion.zsh
@@ -1,5 +1,5 @@
 # load our own completion functions
-fpath=(~/.zsh/completion /usr/local/share/zsh/site-functions $fpath)
+fpath=(~/.zsh/completion-scripts /usr/local/share/zsh/site-functions $fpath)
 
 # completion; use cache if updated within 24h
 autoload -Uz compinit