diff --git a/make.sh b/make.sh
index a87f706ff..e8af68a2c 100755
--- a/make.sh
+++ b/make.sh
@@ -279,8 +279,6 @@ buildtoolchain() {
     LOGFILE="$BASEDIR/log/_build.toolchain.log"
     export LOGFILE
 
-    local ORG_PATH=$PATH
-    export PATH="/tools/ccache/bin:/tools/bin:$PATH"
     lfsmake1 ccache			PASS=1
     lfsmake1 binutils			PASS=1
     lfsmake1 gcc			PASS=1
@@ -316,7 +314,6 @@ buildtoolchain() {
     lfsmake1 xz
     lfsmake1 fake-environ
     lfsmake1 cleanup-toolchain		PASS=2
-    export PATH=$ORG_PATH
 }
 
 buildbase() {
diff --git a/tools/make-functions b/tools/make-functions
index 49e8fba62..00478173a 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -565,7 +565,9 @@ lfsmake1() {
 
 	local PKG_TIME_START=`date +%s`
 
-	cd $BASEDIR/lfs && make -f $* 	BUILDTARGET=$BUILDTARGET \
+	cd $BASEDIR/lfs && \
+		PATH="/tools/ccache/bin:/tools/bin:$PATH" \
+		make -f $* 	BUILDTARGET=$BUILDTARGET \
 						CROSSTARGET="${CROSSTARGET}" \
 						MACHINE=$MACHINE \
 						MACHINE_TYPE=$MACHINE_TYPE \