diff --git a/Projects/AthSimulation/build.sh b/Projects/AthSimulation/build.sh
index b972dd68c32665c1bdf8b5074fbdd3405ad0666e..e8f544fd4a96783dacd44e6c4bd46654180271ab 100755
--- a/Projects/AthSimulation/build.sh
+++ b/Projects/AthSimulation/build.sh
@@ -85,7 +85,8 @@ if [ -z "$BUILDDIR" ]; then
 fi
 mkdir -p ${BUILDDIR}
 BUILDDIR=$(cd ${BUILDDIR} && pwd)
-source $AthSimulationSrcDir/build_env.sh -b $BUILDDIR
+source $AthSimulationSrcDir/build_env.sh -b $BUILDDIR >& ${BUILDDIR}/build_env.log
+cat ${BUILDDIR}/build_env.log
 
 # create the actual build directory
 mkdir -p ${BUILDDIR}/build/AthSimulation
diff --git a/Projects/AthSimulation/build_externals.sh b/Projects/AthSimulation/build_externals.sh
index 16b6543574c735452a3f22a47877799270a481ff..ba55d96dd9fbe608300028be2ae31c3e7cb811f7 100755
--- a/Projects/AthSimulation/build_externals.sh
+++ b/Projects/AthSimulation/build_externals.sh
@@ -72,6 +72,7 @@ fi
 
 # Stop on errors from here on out:
 set -e
+set -o pipefail
 
 # We are in BASH, get the path of this script in a simple way:
 thisdir=$(dirname ${BASH_SOURCE[0]})
@@ -95,7 +96,7 @@ if [ "$FORCE" = "1" ]; then
 fi
 
 # Create some directories:
-mkdir -p ${BUILDDIR}/install
+mkdir -p ${BUILDDIR}/{src,install}
 
 # Set some environment variables that the builds use internally:
 export NICOS_PROJECT_VERSION=`cat ${thisdir}/version.txt`
@@ -121,7 +122,7 @@ AthSimulationExternalsVersion=$(awk '/^AthSimulationExternalsVersion/{print $3}'
 # Check out AthSimulationExternals from the right branch/tag:
 ${scriptsdir}/checkout_atlasexternals.sh \
     -t ${AthSimulationExternalsVersion} \
-    -s ${BUILDDIR}/src/AthSimulationExternals
+    -s ${BUILDDIR}/src/AthSimulationExternals 2>&1 | tee ${BUILDDIR}/src/checkout.AthSimulationExternals.log 
 
 # Build AthSimulationExternals:
 export NICOS_PROJECT_HOME=$(cd ${BUILDDIR}/install;pwd)/AthSimulationExternals
@@ -142,7 +143,7 @@ GaudiVersion=$(awk '/^GaudiVersion/{print $3}' ${thisdir}/externals.txt)
 # Check out Gaudi from the right branch/tag:
 ${scriptsdir}/checkout_Gaudi.sh \
     -t ${GaudiVersion} \
-    -s ${BUILDDIR}/src/GAUDI
+    -s ${BUILDDIR}/src/GAUDI 2>&1 | tee ${BUILDDIR}/src/checkout.GAUDI.log
 
 # Build Gaudi:
 export NICOS_PROJECT_HOME=$(cd ${BUILDDIR}/install;pwd)/GAUDI
@@ -152,3 +153,4 @@ ${scriptsdir}/build_Gaudi.sh \
     -i ${BUILDDIR}/install/GAUDI/${NICOS_PROJECT_VERSION} \
     -e ${BUILDDIR}/install/AthSimulationExternals/${NICOS_PROJECT_VERSION}/InstallArea/${platform} \
     -p AthSimulationExternals -f ${platform} ${RPMOPTIONS} -t ${BUILDTYPE}
+
diff --git a/Projects/Athena/build.sh b/Projects/Athena/build.sh
index 67da112d7b9f6d09d1f7009505fc50b3b6920e74..a40c1982c9e3f92f353d1f98d98304dc2e24172f 100755
--- a/Projects/Athena/build.sh
+++ b/Projects/Athena/build.sh
@@ -83,7 +83,8 @@ if [ -z "$BUILDDIR" ]; then
 fi
 mkdir -p ${BUILDDIR}
 BUILDDIR=$(cd ${BUILDDIR} && pwd)
-source $AthenaSrcDir/build_env.sh -b $BUILDDIR
+source $AthenaSrcDir/build_env.sh -b $BUILDDIR >& ${BUILDDIR}/build_env.log
+cat ${BUILDDIR}/build_env.log
 
 # Set Gaudi's version to the same value as this project's version:
 export GAUDI_VERSION=`cat ${AthenaSrcDir}/version.txt`
@@ -128,3 +129,4 @@ if [ -n "$EXE_CPACK" ]; then
     time cpack 2>&1 | tee cmake_cpack.log
     cp Athena*.rpm ${BUILDDIR}/
 fi
+
diff --git a/Projects/Athena/build_externals.sh b/Projects/Athena/build_externals.sh
index 46392165be7a557e6cd6e99093534563fa1bc639..1d693182c814ecf9cdf4b21e8165693e2fbb3e82 100755
--- a/Projects/Athena/build_externals.sh
+++ b/Projects/Athena/build_externals.sh
@@ -72,6 +72,7 @@ fi
 
 # Stop on errors from here on out:
 set -e
+set -o pipefail
 
 # We are in BASH, get the path of this script in a simple way:
 thisdir=$(dirname ${BASH_SOURCE[0]})
diff --git a/Projects/AthenaP1/build.sh b/Projects/AthenaP1/build.sh
index e834f3c2dc77abe28e51c1b1a3b791490ca1c4fd..25d0c4ec398d3b651c272925fa6ebde41922e364 100755
--- a/Projects/AthenaP1/build.sh
+++ b/Projects/AthenaP1/build.sh
@@ -83,7 +83,8 @@ if [ -z "$BUILDDIR" ]; then
 fi
 mkdir -p ${BUILDDIR}
 BUILDDIR=$(cd ${BUILDDIR} && pwd)
-source $AthenaP1SrcDir/build_env.sh -b $BUILDDIR
+source $AthenaP1SrcDir/build_env.sh -b $BUILDDIR >& ${BUILDDIR}/build_env.log
+cat ${BUILDDIR}/build_env.log
 
 # Set Gaudi's version to the same value as this project's version:
 export GAUDI_VERSION=`cat ${AthenaP1SrcDir}/version.txt`
diff --git a/Projects/AthenaP1/build_externals.sh b/Projects/AthenaP1/build_externals.sh
index 793e56e07f6d1182ace5e72cada07c4ae52ffc6b..40535957116323f6f2d3bba03e3d452bb7c0e02c 100755
--- a/Projects/AthenaP1/build_externals.sh
+++ b/Projects/AthenaP1/build_externals.sh
@@ -72,6 +72,7 @@ fi
 
 # Stop on errors from here on out:
 set -e
+set -o pipefail
 
 # We are in BASH, get the path of this script in a simple way:
 thisdir=$(dirname ${BASH_SOURCE[0]})
@@ -95,7 +96,7 @@ if [ "$FORCE" = "1" ]; then
 fi
 
 # Create some directories:
-mkdir -p ${BUILDDIR}/install
+mkdir -p ${BUILDDIR}/{src,install}
 
 # Set some environment variables that the builds use internally:
 export NICOS_PROJECT_VERSION=`cat ${thisdir}/version.txt`
@@ -121,7 +122,7 @@ AthenaExternalsVersion=$(awk '/^AthenaExternalsVersion/{print $3}' ${thisdir}/ex
 # Check out AthenaExternals from the right branch/tag:
 ${scriptsdir}/checkout_atlasexternals.sh \
     -t ${AthenaExternalsVersion} \
-    -s ${BUILDDIR}/src/AthenaExternals
+    -s ${BUILDDIR}/src/AthenaExternals 2>&1 | tee ${BUILDDIR}/src/checkout.AthenaExternals.log
 
 # Build AthenaExternals:
 export NICOS_PROJECT_HOME=$(cd ${BUILDDIR}/install;pwd)/AthenaExternals
@@ -142,7 +143,7 @@ GaudiVersion=$(awk '/^GaudiVersion/{print $3}' ${thisdir}/externals.txt)
 # Check out Gaudi from the right branch/tag:
 ${scriptsdir}/checkout_Gaudi.sh \
     -t ${GaudiVersion} \
-    -s ${BUILDDIR}/src/GAUDI
+    -s ${BUILDDIR}/src/GAUDI 2>&1 | tee ${BUILDDIR}/src/checkout.GAUDI.log
 
 # Build Gaudi:
 export NICOS_PROJECT_HOME=$(cd ${BUILDDIR}/install;pwd)/GAUDI
@@ -152,3 +153,4 @@ ${scriptsdir}/build_Gaudi.sh \
     -i ${BUILDDIR}/install/GAUDI/${NICOS_PROJECT_VERSION} \
     -e ${BUILDDIR}/install/AthenaExternals/${NICOS_PROJECT_VERSION}/InstallArea/${platform} \
     -p AthenaExternals -f ${platform} ${RPMOPTIONS} -t ${BUILDTYPE}
+