diff --git a/.zprofile b/.zprofile
new file mode 100644
index 00000000..40f47552
--- /dev/null
+++ b/.zprofile
@@ -0,0 +1,82 @@
+#
+# Executes commands at login pre-zshrc.
+#
+# Authors:
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+#
+# Browser
+#
+
+if [[ "$OSTYPE" == darwin* ]]; then
+  export BROWSER='open'
+fi
+
+#
+# Editors
+#
+
+export EDITOR='vim'
+export VISUAL='vim'
+export PAGER='less'
+
+#
+# Language
+#
+
+if [[ -z "$LANG" ]]; then
+  export LANG='en_GB.UTF-8'
+fi
+
+#
+# Paths
+#
+
+# Ensure path arrays do not contain duplicates.
+typeset -gU cdpath fpath mailpath path
+
+# Set the the list of directories that cd searches.
+# cdpath=(
+#   $cdpath
+# )
+
+
+# Set the list of directories that Zsh searches for programs.
+path=(
+  /usr/local/{bin,sbin}
+  $path
+)
+
+#
+# Less
+#
+
+# Set the default Less options.
+# Mouse-wheel scrolling has been disabled by -X (disable screen clearing).
+# Remove -X and -F (exit if the content fits on one screen) to enable it.
+export LESS='-F -g -i -M -R -S -w -X -z-4'
+
+# Set the Less input preprocessor.
+# Try both `lesspipe` and `lesspipe.sh` as either might exist on a system.
+if (( $#commands[(i)lesspipe(|.sh)] )); then
+  export LESSOPEN="| /usr/bin/env $commands[(i)lesspipe(|.sh)] %s 2>&-"
+fi
+
+#
+# Temporary Files
+#
+
+if [[ ! -d "$TMPDIR" ]]; then
+  export TMPDIR="/tmp/$LOGNAME"
+  mkdir -p -m 700 "$TMPDIR"
+fi
+
+TMPPREFIX="${TMPDIR%/}/zsh"
+
+# stuff that checks if it's added to the .zshrc exipliclty
+export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+
+# other common env vars
+source ~/.setenv
diff --git a/.zshrc b/.zshrc
index 4b9581e2..fa863db2 100644
--- a/.zshrc
+++ b/.zshrc
@@ -47,12 +47,6 @@ fi
 
 alias benice="ionice -c3 nice -n20"
 
-# stuff that checks if it's added to the .zshrc exipliclty
-export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
-[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
-
-# other common env vars
-source ~/.setenv
 
 # TMUX
 if which tmux >/dev/null 2>&1; then
diff --git a/common/configure_fresh_system b/common/configure_fresh_system
index dcbc380b..1688f467 100755
--- a/common/configure_fresh_system
+++ b/common/configure_fresh_system
@@ -38,7 +38,7 @@ ln -vfs "$DIR/.tmux.conf" ~/.
 rm -f "~/.zshrc"
 ln -vfs "$DIR/.zprezto" ~/.
 ln -vfs "$DIR/.zprezto/runcoms/zpreztorc" ~/.zpreztorc
-ln -vfs "$DIR/.zprezto/runcoms/zprofile" ~/.zprofile
+ln -vfs "$DIR/.zprofile" ~/.zprofile
 ln -vfs "$DIR/.zprezto/runcoms/zshenv" ~/.zshenv
 ln -vfs "$DIR/.zprezto/runcoms/zshrc" ~/.zshrc