diff --git a/.gitmodules b/.gitmodules
index cb8f419e..a333b1d8 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/z/externel"]
+	path = modules/z/externel
+	url = https://github.com/rupa/z.git
diff --git a/modules/z/README.md b/modules/z/README.md
new file mode 100644
index 00000000..a8c3fcc7
--- /dev/null
+++ b/modules/z/README.md
@@ -0,0 +1,32 @@
+Z
+===
+
+This is [z](https://github.com/rupa/z) ported to a prezto module.
+
+Tracks your most used directories, based on 'frecency'.
+
+Usage
+---
+
+```
+z [-chlrtx] [regex1 regex2 ... regexn]
+```
+
+Example
+---
+
+```
+z foo         cd to most frecent dir matching foo
+
+z foo bar     cd to most frecent dir matching foo, then bar
+
+z -r foo      cd to highest ranked dir matching foo
+
+z -t foo      cd to most recently accessed dir matching foo
+
+z -l foo      list all dirs matching foo (by frecency)
+```
+
+For more usage information, please read the [original repository](https://github.com/rupa/z).
+
+
diff --git a/modules/z/externel b/modules/z/externel
new file mode 160000
index 00000000..b620b0a8
--- /dev/null
+++ b/modules/z/externel
@@ -0,0 +1 @@
+Subproject commit b620b0a8af9fa4bd476087484fd0626d16fc4358
diff --git a/modules/z/init.zsh b/modules/z/init.zsh
new file mode 100644
index 00000000..361cbd12
--- /dev/null
+++ b/modules/z/init.zsh
@@ -0,0 +1 @@
+source "${0:h}/externel/z.sh"