diff --git a/scripts/env.sh b/scripts/env.sh
index dbffc21..11083bb 100755
--- a/scripts/env.sh
+++ b/scripts/env.sh
@@ -17,12 +17,17 @@
 # environment.
 
 if [[ ! -v _BRCHESS_ENV_ ]]; then
-    export _BRCHESS_ENV_=1 BRCHESS_ROOT BRLIBDIR LD_LIBRARY_PATH
+    export _BRCHESS_ENV_=1 BRCHESS_ROOT LD_LIBRARY_PATH
     BRCHESS_ROOT=$(realpath -L "$(dirname "${BASH_SOURCE[0]}")/..")
-    BRLIBDIR="$BRCHESS_ROOT/brlib/lib"
-    LD_LIBRARY_PATH="${BRLIBDIR}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-    PATH="$PATH:$BRCHESS_ROOT/bin:=$BRCHESS_ROOT/scripts"
+
+    BRCHESS_SCRIPTDIR="$BRCHESS_ROOT/scripts"
+    BRCHESS_BINDIR="$BRCHESS_ROOT/bin"
+    PATH="$PATH:$BRCHESS_BINDIR:$BRCHESS_SCRIPTDIR"
+
+    BRCHESS_BRLIBDIR="$BRCHESS_ROOT/brlib"
+    BRCHESS_LIBDIR="$BRCHESS_BRLIBDIR/lib"
+    LD_LIBRARY_PATH="${BRCHESS_LIBDIR}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
     #printf "R=%s L=%s LD=%s\n" "$BRCHESS_ROOT" "$BRLIB_DIR" "$LD_LIBRARY_PATH"
-    printf "Chess environment complete.\n"
-    unset BRLIBDIR BRCHESS_ROOT
+    unset BRCHESS_SCRIPTDIR BRCHESS_BINDIR BRCHESS_LIBDIR
+    printf "brchess environment complete.\n"
 fi