diff --git a/.gitmodules b/.gitmodules
index 7a7a7b5e..48d12f2d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,7 @@
 [submodule "modules/completion/external"]
 	path = modules/completion/external
 	url = https://github.com/zsh-users/zsh-completions.git
+[submodule "modules/z/external"]
+	path = modules/z/external
+	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..4207bdc4
--- /dev/null
+++ b/modules/z/README.md
@@ -0,0 +1,14 @@
+z
+=
+
+Provides support for [z][1] ("jump around").
+
+Authors
+-------
+
+    -   [rupa][https://github.com/rupa]
+
+    -   [Ömer Yildiz][https://github.com/systemfreund]
+
+[1]: https://github.com/rupa/z
+
diff --git a/modules/z/external b/modules/z/external
new file mode 160000
index 00000000..6de41080
--- /dev/null
+++ b/modules/z/external
@@ -0,0 +1 @@
+Subproject commit 6de41080cbcd208c5067c504d4572c24314e6123
diff --git a/modules/z/init.zsh b/modules/z/init.zsh
new file mode 100644
index 00000000..973ae65a
--- /dev/null
+++ b/modules/z/init.zsh
@@ -0,0 +1,2 @@
+# Source module files.
+source "${0:h}/external/z.sh"