diff --git a/.gitmodules b/.gitmodules
index a8a9e57a..f6fed261 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "modules/prompt/functions/pure"]
 	path = modules/prompt/external/pure
 	url = https://github.com/sindresorhus/pure.git
+[submodule "modules/prompt/external/geertjohan"]
+	path = modules/prompt/external/geertjohan
+	url = https://github.com/GeertJohan/prezto_prompt_geertjohan.git
diff --git a/modules/prompt/external/geertjohan b/modules/prompt/external/geertjohan
new file mode 160000
index 00000000..76561bd9
--- /dev/null
+++ b/modules/prompt/external/geertjohan
@@ -0,0 +1 @@
+Subproject commit 76561bd93def3a9bf18a6c92940d80884033d43a
diff --git a/modules/prompt/functions/prompt_geertjohan_setup b/modules/prompt/functions/prompt_geertjohan_setup
new file mode 120000
index 00000000..59c9a05f
--- /dev/null
+++ b/modules/prompt/functions/prompt_geertjohan_setup
@@ -0,0 +1 @@
+../external/geertjohan/prompt_geertjohan_setup
\ No newline at end of file