diff --git a/.gitmodules b/.gitmodules
index 792f12c2..7a7a7b5e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,6 @@
 [submodule "modules/syntax-highlighting/external"]
 	path = modules/syntax-highlighting/external
 	url = https://github.com/zsh-users/zsh-syntax-highlighting.git
-[submodule "modules/completion/functions"]
-	path = modules/completion/functions
+[submodule "modules/completion/external"]
+	path = modules/completion/external
 	url = https://github.com/zsh-users/zsh-completions.git
diff --git a/modules/completion/external b/modules/completion/external
new file mode 160000
index 00000000..589938ff
--- /dev/null
+++ b/modules/completion/external
@@ -0,0 +1 @@
+Subproject commit 589938ffc9c241952743051d907f7cb451eb157f
diff --git a/modules/completion/functions b/modules/completion/functions
deleted file mode 160000
index 8b89dd9d..00000000
--- a/modules/completion/functions
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8b89dd9d10e86313f49fafdf88e8540f97346f33
diff --git a/modules/completion/init.zsh b/modules/completion/init.zsh
index 2c067bf2..ab375d4c 100644
--- a/modules/completion/init.zsh
+++ b/modules/completion/init.zsh
@@ -11,6 +11,9 @@ if [[ "$TERM" == 'dumb' ]]; then
   return 1
 fi
 
+# Add zsh-completions to $fpath.
+fpath=("${0:h}/external/src" $fpath)
+
 # Load and initialize the completion system ignoring insecure directories.
 autoload -Uz compinit && compinit -i