diff --git a/profile b/profile
index a46152f..f002eb5 100644
--- a/profile
+++ b/profile
@@ -1,23 +1,11 @@
 # .profile
 # vim: ft=zsh
-# Eryn Wells <eryn@3b518c.com>
-
-# Environment settings
-PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/X11/bin
-PAGER="less"
-MANPAGER="less"
-EDITOR="vim"
-VISUAL=$EDITOR
-LESSHISTFILE="-"
-GREP_OPTIONS="--color=auto"
-GREP_COLOR="1;32"
-export PAGER MANPAGER EDITOR VISUAL LESSHISTFILE GREP_OPTIONS GREP_COLOR
+# Eryn Wells <eryn@erynwells.me>
 
 # Gotta do some machine specific setup
 arch=`uname -s`
 case $arch in
     Linux)
-        export MAIL="/var/mail/$USER"
         alias iptls='sudo iptables --line-numbers -nv -L'
         alias ip6tls='sudo ip6tables --line-numbers -nv -L'
         alias rlx="xrdb $HOME/.Xdefaults"
@@ -26,7 +14,6 @@ case $arch in
     Darwin)
 	alias indent='gnuindent'
 	alias acls='/bin/ls -le'
-	PATH=/opt/local/bin:$PATH
     ;;
 esac
 
@@ -35,8 +22,6 @@ esac
 export NETHACKOPTIONS="color"
 
 [ -e $HOME/.profile-local ] && source $HOME/.profile-local
-[ -d $HOME/.local/bin ] && PATH=$HOME/.local/bin:$PATH
-[ -d $HOME/bin ] && PATH=$HOME/bin:$PATH
 
 # Start SSH agent for password-less logins
 if [ -z "$SSH_AUTH_SOCK" -a -x "$SSHAGENT" ]
diff --git a/setup.sh b/setup.sh
index 5754d65..edec110 100755
--- a/setup.sh
+++ b/setup.sh
@@ -8,6 +8,7 @@ ln -s $dfdir/rc $HOME/.rc
 ln -s $dfdir/zshrc $HOME/.zshrc
 ln -s $dfdir/zsh $HOME/.zsh
 ln -s $dfdir/zprofile $HOME/.zprofile
+ln -s $dfdir/zshenv $HOME/.zshenv
 
 ln -s $dfdir/vimrc $HOME/.vimrc
 ln -s $dfdir/vim $HOME/.vim
diff --git a/zshenv b/zshenv
new file mode 100644
index 0000000..7a46013
--- /dev/null
+++ b/zshenv
@@ -0,0 +1,25 @@
+# .zshenv
+# vim: ft=zsh
+# Eryn Wells <eryn@erynwells.me>
+
+
+PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/X11/bin
+[ -d /opt/local/bin ]   && PATH=$PATH:/opt/local/bin
+[ -d $HOME/.local/bin ] && PATH=$PATH:$HOME/.local/bin
+[ -d $HOME/bin ]        && PATH=$PATH:$HOME/bin
+
+PAGER="less"
+MANPAGER=$PAGER
+EDITOR="vim"
+VISUAL=$EDITOR
+LESSHISTFILE="-"
+GREP_OPTIONS="--color=auto"
+GREP_COLOR="1;32"
+
+export PATH \
+       PAGER MANPAGER \
+       EDITOR VISUAL \
+       LESSHISTFILE \
+       GREP_OPTIONS GREP_COLOR
+
+[ `uname -s` = "Linux" ] && export MAIL="/var/mail/$USER"