diff --git a/lfs/cleanup-toolchain b/lfs/cleanup-toolchain
index e4839b951..2fc460ee4 100644
--- a/lfs/cleanup-toolchain
+++ b/lfs/cleanup-toolchain
@@ -67,6 +67,9 @@ ifeq "$(TOOLCHAIN)" "1"
 
 	# Update/create linker cache.
 	/tools/sbin/ldconfig
+
+	# Set a marker when the toolchain was successfully built
+	touch /tools/.toolchain-successful
 else
 	mv -v /tools/bin/{ld,ld-old}
 	mv -v /tools/$(BUILDTARGET)/bin/{ld,ld-old}
diff --git a/make.sh b/make.sh
index 4b1cea4a2..a5ebe0dd9 100755
--- a/make.sh
+++ b/make.sh
@@ -1017,7 +1017,7 @@ build)
 	clear
 	PACKAGE=`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.gz 2> /dev/null | head -n 1`
 	#only restore on a clean disk
-	if [ ! -f log/cleanup-toolchain-2-tools ]; then
+	if [ ! -e "${BASEDIR}/build/tools/.toolchain-successful" ]; then
 		if [ ! -n "$PACKAGE" ]; then
 			beautify build_stage "Full toolchain compilation - Native GCC: `gcc --version | grep GCC | awk {'print $3'}`"
 			prepareenv