diff --git a/CLFS/master.sh b/CLFS/master.sh
index 6bdc38b..a6c2543 100755
--- a/CLFS/master.sh
+++ b/CLFS/master.sh
@@ -184,6 +184,7 @@ temptools_Makefiles() {       #
     # Insert instructions for unpacking the package and to set the PKGDIR variable.
     #
     [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*"
+    [[ "$vrs" != "" ]] && [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags
     #
     wrt_run_as_su "${this_script}" "${file}"
     #
@@ -255,6 +256,7 @@ boot_Makefiles() {            #
     # Insert instructions for unpacking the package and changing directories
     #
     [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*"
+    [[ "$vrs" != "" ]] && [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags
     #
     # Select a script execution method
     case $this_script in
@@ -325,6 +327,7 @@ chroot_Makefiles() {          #
         *util-linux)    wrt_unpack  "$name-$vrs.tar.*"  ;;
         *)              wrt_unpack2 "$name-$vrs.tar.*"  ;;
       esac
+      [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags
     fi
     #
     # Select a script execution method
@@ -385,6 +388,7 @@ testsuite_tools_Makefiles() { #
       tcl)    wrt_unpack2 "$name$vrs-src.tar.*" ;;
       *)      wrt_unpack2 "$name-$vrs.tar.*"    ;;
     esac
+    [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags
     #
     wrt_run_as_chroot1 "${this_script}" "${file}"
     #
@@ -439,6 +443,7 @@ bm_testsuite_tools_Makefiles() { #
       tcl)    wrt_unpack3 "$name$vrs-src.tar.*" ;;
       *)      wrt_unpack3 "$name-$vrs.tar.*"    ;;
     esac
+    [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags
     #
     wrt_run_as_root2 "${this_script}" "${file}"
     #
@@ -537,6 +542,7 @@ final_system_Makefiles() {    #
     if [ "$vrs" != "" ] ; then
       FILE="$name-$vrs.tar.*"
       wrt_unpack2 "$FILE"
+      [[ "$OPTIMIZE" != "0" ]] &&  wrt_optimize "$name" && wrt_makeflags
     fi
     #
     wrt_run_as_chroot1 "${this_script}" "${file}"
@@ -639,6 +645,7 @@ bm_final_system_Makefiles() { #
     if [ "$vrs" != "" ] ; then
       FILE="$name-$vrs.tar.*"
       wrt_unpack3 "$FILE"
+      [[ "$OPTIMIZE" != "0" ]] &&  wrt_optimize "$name" && wrt_makeflags
     fi
     #
     wrt_run_as_root2 "${this_script}" "${file}"
diff --git a/HLFS/master.sh b/HLFS/master.sh
index 03e3550..719ad7d 100755
--- a/HLFS/master.sh
+++ b/HLFS/master.sh
@@ -140,9 +140,10 @@ chapter5_Makefiles() {       # Bootstrap or temptools phase
         gcc)    FILE="gcc-core-$vrs.tar.*"  ;;
         *)      FILE="$name-$vrs.tar.*"     ;;
       esac
-     # Insert instructions for unpacking the package and to set the PKGDIR variable.
-     wrt_unpack "$FILE"
-  fi
+      # Insert instructions for unpacking the package and to set the PKGDIR variable.
+      wrt_unpack "$FILE"
+      [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags
+    fi
 
     case $this_script in
       *binutils* )  # Dump the path to sources directory for later removal
@@ -308,6 +309,7 @@ chapter6_Makefiles() {       # sysroot or chroot build phase
       esac
       wrt_unpack2 "$FILE"
       wrt_target_vars
+      [[ "$OPTIMIZE" != "0" ]] &&  wrt_optimize "$name" && wrt_makeflags
     fi
 
     case $this_script in