diff --git a/shell/zsh/.zshenv b/shell/zsh/.zshenv
index a02d8b5a..5859f8dc 100644
--- a/shell/zsh/.zshenv
+++ b/shell/zsh/.zshenv
@@ -3,7 +3,7 @@ source $(cd ${${(%):-%x}:A:h}/../.. && pwd -P)/env
 
 # Move ZDOTDIR from $HOME to reduce dotfile pollution.
 export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
-export ZGEN_SOURCE="$XDG_CACHE_HOME/zgen"
+export ZGEN_DIR="$XDG_CACHE_HOME/zgen"
 
 # paths
 typeset -gU cdpath fpath mailpath path
@@ -11,6 +11,7 @@ path=( $XDG_BIN_HOME $DOTFILES/bin $DOTFILES_DATA/*.topic/bin(N) $path )
 fpath=( $ZDOTDIR/functions $fpath )
 
 # envvars
+export SHELL=$(command -v zsh)
 export LANG=${LANG:-en_US.UTF-8}
 export PAGER=less
 export LESS='-R -i -w -M -z-4'
diff --git a/shell/zsh/.zshrc b/shell/zsh/.zshrc
index 93b7dc30..01f86067 100644
--- a/shell/zsh/.zshrc
+++ b/shell/zsh/.zshrc
@@ -1,7 +1,7 @@
 export ZGEN_AUTOLOAD_COMPINIT=0
 AUTOPAIR_INHIBIT_INIT=1
 
-_load_repo tarjoilija/zgen $ZGEN_SOURCE zgen.zsh
+_load_repo tarjoilija/zgen $ZGEN_DIR zgen.zsh
 if ! zgen saved; then
   echo "Creating zgen save"
   _cache_clear