 +# Not using Paco with uClibc, even if requested
 +if [ $PROGNAME = "hlfs" ]; then
 +  if [ $MODEL = "uclibc" ]; then
-+    $USE_PACO = 0
++    USE_PACO=0
 +  fi
 +fi
 +

         <xsl:apply-templates/>
Index: HLFS/master.sh
===================================================================
--- HLFS/master.sh	(revision 2520)
+++ HLFS/master.sh	(working copy)
@@ -376,7 +376,9 @@
         wrt_run_as_root "${this_script}" "${file}"
         ;;
       *)   # The rest of Chapter06

     esac
 
     # Remove the build directory(ies) except if the package build fails.
@@ -206,6 +215,14 @@
 
     # Keep the script file name for Makefile dependencies.
     PREV=${this_script}
+
+    # Reinstalling paco after readsjusting the toolchain.
+    case "${this_script}" in
+      *readjusting)
+        PACO_NUM=`echo ${this_script} | sed -e 's/readjusting/x-paco/'`
+        wrt_paco_inst "$PACO_NUM" ;;
+    esac
+
   done # end for file in chapter06/*
 }
 
@@ -267,6 +284,14 @@
                 wrt_run_as_chroot2 "$this_script" "$file"
               fi
         ;;
