diff --git a/plugins/z/cd.fish b/plugins/z/cd.fish
new file mode 100644
index 0000000..bc9cbee
--- /dev/null
+++ b/plugins/z/cd.fish
@@ -0,0 +1,15 @@
+#
+# Source a .rvmrc file in a directory after changing to it, if it exists.
+# To disable this feature, set rvm_project_rvmrc=0 in $HOME/.rvmrc
+#
+function cd --description "Change directory"
+  redefine_function 'cd' "$__fish_datadir/functions/cd.fish" '
+    function cd --description "Change working directory"
+      old_cd "$argv"
+
+      bash -c "source /usr/local/etc/profile.d/z.sh; _z --add `pwd -P`"
+    end
+'
+
+  cd "$argv"
+end
diff --git a/plugins/z/z.fish b/plugins/z/z.fish
new file mode 100644
index 0000000..24227fe
--- /dev/null
+++ b/plugins/z/z.fish
@@ -0,0 +1,3 @@
+function z
+  cd (bash -c 'source /usr/local/etc/profile.d/z.sh; _z $0; echo $PWD' $argv)
+end