diff --git a/.gitmodules b/.gitmodules
index c1e0c56..ee0271d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "shell/zsh/zsh-syntax-highlighting"]
   path = shell/zsh/zsh-syntax-highlighting
   url = git://github.com/zsh-users/zsh-syntax-highlighting.git
+[submodule "shell/z"]
+  path = shell/z
+  url = git@github.com:jimeh/z.git
diff --git a/shell/_main.sh b/shell/_main.sh
index 12ed752..52da63a 100644
--- a/shell/_main.sh
+++ b/shell/_main.sh
@@ -35,5 +35,8 @@ source "$DOTSHELL/sbcl.sh"
 # Services
 source "$DOTSHELL/services.sh"
 
+# Shell related
+source "$DOTSHELL/z.sh"
+
 # Environment Setup
 source "$DOTSHELL/env.sh"
diff --git a/shell/z b/shell/z
new file mode 160000
index 0000000..03b37b0
--- /dev/null
+++ b/shell/z
@@ -0,0 +1 @@
+Subproject commit 03b37b073e08d9657870180e07434f031c1b94f1
diff --git a/shell/z.sh b/shell/z.sh
new file mode 100644
index 0000000..34d2c35
--- /dev/null
+++ b/shell/z.sh
@@ -0,0 +1,8 @@
+#
+# Setup for z (https://github.com/rupa/z)
+#
+
+if [ -f "$DOTSHELL/z/z.sh" ]; then
+  _Z_NO_RESOLVE_SYMLINKS=1
+  source "$DOTSHELL/z/z.sh"
+fi