diff --git a/scripts/cvmfs/setup-nightlies.sh b/scripts/cvmfs/setup-nightlies.sh
index 56af5ca9..c73863ed 100644
--- a/scripts/cvmfs/setup-nightlies.sh
+++ b/scripts/cvmfs/setup-nightlies.sh
@@ -166,8 +166,11 @@ k4_local_repo() {
     export PKG_CONFIG_PATH=$PWD/$install/lib/pkgconfig:$PKG_CONFIG_PATH
     export ROOT_INCLUDE_PATH=$PWD/$install/include:$ROOT_INCLUDE_PATH
     if [ "$current_repo" = "k4geo" ]; then
+        export LCGEO=$PWD
         export K4GEO=$PWD
-        echo "Added K4GEO=$PWD"
+        export lcgeo_DIR=$PWD
+        export k4geo_DIR=$PWD
+        echo "Added LCGEO, K4GEO, lcgeo_DIR and k4geo_DIR to the environment"
     fi
     echo "Added $PWD/$install to the environment and removed any paths containing /${current_repo}/"
     echo "Some variables may have to be updated manually to point to the local installation"
diff --git a/scripts/cvmfs/setup-releases.sh b/scripts/cvmfs/setup-releases.sh
index fcac510a..9929a521 100644
--- a/scripts/cvmfs/setup-releases.sh
+++ b/scripts/cvmfs/setup-releases.sh
@@ -161,8 +161,11 @@ k4_local_repo() {
     export PKG_CONFIG_PATH=$PWD/$install/lib/pkgconfig:$PKG_CONFIG_PATH
     export ROOT_INCLUDE_PATH=$PWD/$install/include:$ROOT_INCLUDE_PATH
     if [ "$current_repo" = "k4geo" ]; then
+        export LCGEO=$PWD
         export K4GEO=$PWD
-        echo "Added K4GEO=$PWD"
+        export lcgeo_DIR=$PWD
+        export k4geo_DIR=$PWD
+        echo "Added LCGEO, K4GEO, lcgeo_DIR and k4geo_DIR to the environment"
     fi
     echo "Added $PWD/$install to the environment and removed any paths containing /${current_repo}/"
     echo "Some variables may have to be updated manually to point to the local installation"