diff --git a/zshrc b/zshrc
index 2f0a456..b8555ca 100644
--- a/zshrc
+++ b/zshrc
@@ -1,6 +1,6 @@
 # -*- sh -*-
 
-# Prompt
+# General options
 
 enable -r repeat
 setopt no_beep
@@ -10,9 +10,7 @@ setopt hash_list_all
 setopt extended_glob
 setopt ksh_glob
 
-setopt autopushd
-export DIRSTACKSIZE=30
-alias d='dirs -v'
+# Prompt
 
 autoload colors ; colors
 
@@ -98,6 +96,12 @@ zstyle -e ':completion:*:approximate:*' max-errors \
 zstyle ':completion:*' list-colors ''
 zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
 
+# Dirstack handling
+
+setopt autopushd
+DIRSTACKSIZE=30
+alias d='dirs -v'
+
 # Convenience
 
 do-startx() {