diff --git a/tag-zsh/zsh/configs/completion.zsh b/tag-zsh/zsh/configs/completion.zsh
index 08d085d5..5255f263 100644
--- a/tag-zsh/zsh/configs/completion.zsh
+++ b/tag-zsh/zsh/configs/completion.zsh
@@ -1,6 +1,18 @@
-autoload -U compinit
-compinit
+# load our own completion functions
+fpath=(
+  ~/.zsh/completion
+  /usr/local/share/zsh/site-functions
+  $fpath
+)
 
-## case-insensitive (all), partial-word and then substring completion
-zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' \
-    'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
\ No newline at end of file
+# completion; use cache if updated within 24h
+autoload -Uz compinit
+if [[ -n $HOME/.zcompdump(#qN.mh+24) ]]; then
+  compinit -d $HOME/.zcompdump;
+else
+  compinit -C;
+fi;
+
+# disable zsh bundled function mtools command mcd
+# which causes a conflict.
+compdef -d mcd
diff --git a/tag-zsh/zsh/configs/post/completion.zsh b/tag-zsh/zsh/configs/post/completion.zsh
new file mode 100644
index 00000000..4a7917b0
--- /dev/null
+++ b/tag-zsh/zsh/configs/post/completion.zsh
@@ -0,0 +1,14 @@
+# load our own completion functions
+fpath=(~/.zsh/completion /usr/local/share/zsh/site-functions $fpath)
+
+# completion; use cache if updated within 24h
+autoload -Uz compinit
+if [[ -n $HOME/.zcompdump(#qN.mh+24) ]]; then
+  compinit -d $HOME/.zcompdump;
+else
+  compinit -C;
+fi;
+
+# disable zsh bundled function mtools command mcd
+# which causes a conflict.
+compdef -d mcd
diff --git a/tag-zsh/zsh/functions/g b/tag-zsh/zsh/functions/g
index 6b284290..762f05b2 100644
--- a/tag-zsh/zsh/functions/g
+++ b/tag-zsh/zsh/functions/g
@@ -7,6 +7,3 @@ g() {
     git status --short --branch
   fi
 }
-
-# Complete g like git
-compdef g=git