diff --git a/CLFS/master.sh b/CLFS/master.sh
index b5c3140..efcd74f 100644
--- a/CLFS/master.sh
+++ b/CLFS/master.sh
@@ -924,7 +924,7 @@ mk_CUSTOM_TOOLS: mk_FINAL
 	@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
 	  mkdir -p ${TRACKING_DIR}; \\
 	  \$(call echo_PHASE,Building CUSTOM_TOOLS); \\
-	  ( source /root/.bash_profile && make CUSTOM_TOOLS"); \\
+	  ( source /root/.bash_profile && make CUSTOM_TOOLS ); \\
 	fi;
 	@touch \$@
 
diff --git a/CLFS2/master.sh b/CLFS2/master.sh
index f90428c..1829442 100644
--- a/CLFS2/master.sh
+++ b/CLFS2/master.sh
@@ -422,7 +422,7 @@ build_Makefile() {            # Construct a Makefile from the book scripts
 (
 cat << EOF
 
-all:	ck_UID mk_SETUP mk_LUSER create-sbu_du-report mk_CUSTOM_TOOLS mk_BLFS_TOOL mk_ROOT
+all:	ck_UID mk_SETUP mk_LUSER create-sbu_du-report mk_ROOT
 	@sudo make restore-luser-env
 	@sudo make do-housekeeping
 	@\$(call echo_finished,$VERSION)
@@ -446,18 +446,16 @@ mk_LUSER: mk_SETUP
 	@touch \$@
 
 mk_CUSTOM_TOOLS: create-sbu_du-report
-	@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
-	  \$(call echo_PHASE,Building CUSTOM_TOOLS); \\
-	  \$(call echo_SULUSER_request); \\
+	\$(call echo_PHASE,CUSTOM_TOOLS)
+	@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
 	  (sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\
 	  (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash CUSTOM_TOOLS"); \\
 	fi;
 	@touch \$@
 
 mk_BLFS_TOOL: mk_CUSTOM_TOOLS
+	\$(call echo_PHASE,BLFS_TOOL)
 	@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
-	  \$(call echo_PHASE,Building BLFS_TOOL); \\
-	  \$(call echo_SULUSER_request); \\
 	  (sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\
 	  (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash BLFS_TOOL"); \\
 	fi;
diff --git a/CLFS3/master.sh b/CLFS3/master.sh
index 5714b16..6b9a2fa 100644
--- a/CLFS3/master.sh
+++ b/CLFS3/master.sh
@@ -475,7 +475,7 @@ build_Makefile() {            # Construct a Makefile from the book scripts
 (
 cat << EOF
 
-all:	ck_UID mk_SETUP mk_LUSER create-sbu_du-report mk_CUSTOM_TOOLS mk_ROOT
+all:	ck_UID mk_SETUP mk_LUSER create-sbu_du-report
 	@sudo make restore-luser-env
 	@sudo make do-housekeeping
 	@\$(call echo_finished,$VERSION)
@@ -499,9 +499,8 @@ mk_LUSER: mk_SETUP
 	@touch \$@
 
 mk_CUSTOM_TOOLS: create-sbu_du-report
-	@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
-	  \$(call echo_PHASE,Building CUSTOM_TOOLS); \\
-	  \$(call echo_SULUSER_request); \\
+	\$(call echo_PHASE,Building CUSTOM_TOOLS);
+	@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
 	  (sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\
 	  (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash CUSTOM_TOOLS"); \\
 	fi;
diff --git a/LFS/master.sh b/LFS/master.sh
index aac5691..4e83b57 100644
--- a/LFS/master.sh
+++ b/LFS/master.sh
@@ -461,18 +461,16 @@ mk_BOOT: mk_CHROOT
 	@touch \$@
 
 mk_CUSTOM_TOOLS: create-sbu_du-report
+	\$(call echo_PHASE,Building CUSTOM_TOOLS)
 	@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
-	  \$(call echo_PHASE,Building CUSTOM_TOOLS); \\
-	  \$(call echo_CHROOT_request); \\
 	  sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}; \\
 	  (sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make CUSTOM_TOOLS"); \\
 	fi;
 	@touch \$@
 
 mk_BLFS_TOOL: mk_CUSTOM_TOOLS
+	\$(call echo_PHASE,Building BLFS_TOOL)
 	@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
-	  \$(call echo_PHASE,Building BLFS_TOOL); \\
-	  \$(call echo_CHROOT_request); \\
 	  sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\
 	  (sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL"); \\
 	fi;