diff --git a/zsh/setopt.zsh b/zsh/setopt.zsh
index f2c319e..7b3510d 100644
--- a/zsh/setopt.zsh
+++ b/zsh/setopt.zsh
@@ -8,12 +8,16 @@ setopt interactive_comments
 # If you type foo, and it isn't a command, and it is a directory in your
 # cdpath, go there.
 setopt auto_cd
-# if argument to cd is the name of a parameter whose value is a valid directory, it will become the current directory
-setopt cdablevarS
 
 # ===== directory stack
+# automatically push cd-ed directories onto the directory stack
+setopt auto_pushd
 # do not push duplicates onto the directory stack
-# setopt pushd_ignore_dups
+setopt pushd_ignore_dups
+# Exchange the meaning of + and - when specifying a directory on the stack.
+# This way cd -<Tab> lists the last used directory first, which is more
+# natural because cd - goes to the last directory.
+setopt pushd_minus
 
 # ===== expansion and globbing
 # treat #, ~ and ^ as part of patterns for filename generation