 +      echo -e "export PACO_TMPFILE=$PACO_TMPFILE" >> $JHALFSDIR/pacovars
 +    fi
 +  fi
-   if [[ -n "$FILES" ]]; then
-     # pushd/popd necessary to deal with mulitiple files
-     pushd $PACKAGE_DIR 1> /dev/null
+   if [[ "$COMPARE" != "0" ]] ; then
+     mkdir -p $JHALFSDIR/extras
+     cp extras/* $JHALFSDIR/extras

Index: LFS/master.sh
===================================================================
--- LFS/master.sh	(revision 2588)
+++ LFS/master.sh	(working copy)
@@ -157,6 +157,13 @@
       *stripping*) [[ "${STRIP}" = "0" ]] && continue ;;
     esac
 
+    # Install paco as the first package in ch6, before installing linux-libc-headers.
+    case "${this_script}" in
+      *linux-libc-headers)
+        PACO_NUM=`echo ${this_script} | sed -e 's/linux-libc-headers/a-paco/'`
+        wrt_paco_inst "$PACO_NUM"
+    esac
+
     # First append each name of the script files to a list (this will become
     # the names of the targets in the Makefile
     chapter6="$chapter6 ${this_script}"
@@ -187,7 +194,9 @@
     # and not to use chroot.
     case "${this_script}" in
       *kernfs)  wrt_run_as_root    "${this_script}" "$file" ;;

     --testsuites | -T )
       test $# = 1 && eval "$exit_missing_arg"
       shift
@@ -480,6 +487,15 @@
 
 if [[ "$PWD" != "$JHALFSDIR" ]]; then
   cp $COMMON_DIR/makefile-functions $JHALFSDIR/
