diff --git a/.gitmodules b/.gitmodules
index b203ca7..eed3d0c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "zsh/custom/plugins/fast-syntax-highlighting"]
 	path = zsh/custom/plugins/fast-syntax-highlighting
 	url = https://github.com/zdharma-continuum/fast-syntax-highlighting.git
+[submodule "zsh/custom/plugins/zsh-completions"]
+	path = zsh/custom/plugins/zsh-completions
+	url = https://github.com/zsh-users/zsh-completions.git
diff --git a/zsh/custom/plugins/zsh-completions b/zsh/custom/plugins/zsh-completions
new file mode 160000
index 0000000..b48b5de
--- /dev/null
+++ b/zsh/custom/plugins/zsh-completions
@@ -0,0 +1 @@
+Subproject commit b48b5de9d86708667204d95e8f2490b0952ad2c8
diff --git a/zsh/dot-zshrc b/zsh/dot-zshrc
index 5b304b7..7437408 100644
--- a/zsh/dot-zshrc
+++ b/zsh/dot-zshrc
@@ -45,7 +45,9 @@ ZSH_TMUX_AUTOSTART=true
 ZSH_TMUX_AUTOCONNECT=false
 ZSH_TMUX_FIXTERM=true
 
-source $ZSH/oh-my-zsh.sh
+fpath+=${ZSH_CUSTOM:-${ZSH:-~/.oh-my-zsh}/custom}/plugins/zsh-completions/src
+autoload -U compinit && compinit
+source "$ZSH/oh-my-zsh.sh"
 
 less_termcap[so]="${fg_bold[black]}${bg[white]}"
 export LESS="-F -R -i --incsearch -M"