  
 Index: master.sh
 ===================================================================
---- master.sh	(revision 2916)
+--- master.sh	(revision 3007)
 +++ master.sh	(working copy)
-@@ -194,6 +194,8 @@
+@@ -71,6 +71,11 @@
+   FARCELOGDIR=$LOGDIR/farce
+           XSL=$PROGNAME.xsl
+       PKG_LST=unpacked
++        #--- PACO variables
++ PACO_INCLUDE=/
++ PACO_EXCLUDE=/${SCRIPT_ROOT}
++ PACO_TMPFILE=/tmp/paco.tmp
++   LD_PRELOAD=/usr/lib/libpaco-log.so
+ 
+   case $PROGNAME in
+     clfs2) LFSVRS=development; TREE=branches/clfs-2.0/BOOK ;;
+@@ -122,6 +127,7 @@
+   VIMLANG=${VIMLANG:-n}
+   KEYMAP=${KEYMAP:=none}
+   GRSECURITY_HOST=${GRSECURITY_HOST:-n}
++  USE_PACO=${USE_PACO:-n}
+ 
+ else
+   #
+@@ -230,6 +236,8 @@
  
      --help | -h )  usage | more && exit  ;;
  
-+    --no-paco )            USE_PACO=0    ;;
++    --no-paco )            USE_PACO=n    ;;
 +
      --optimize | -O )
        test $# = 1 && eval "$exit_missing_arg"
        shift
-@@ -489,6 +491,14 @@
+@@ -468,6 +476,14 @@
    [[ $VERBOSITY > 0 ]] && echo "OK"
  fi
  #
 +# paco module
-+if [[ "$USE_PACO" = "1" ]]; then
++if [[ "$USE_PACO" = "y" ]]; then
 +  [[ $VERBOSITY > 0 ]] && echo -n "Loading paco module..."
 +  source $COMMON_DIR/paco-functions
 +  [[ $? > 0 ]] && echo "$COMMON_DIR/paco-functions did not load.." && exit 2

   done  # for file in final-system/* ...
 }
 
@@ -605,6 +634,11 @@
     # Keep the script file name
     this_script=`basename $file`
 

+local PACO_URL2="http://$PACO_MIRROR2.dl.sourceforge.net/sourceforge/paco/$PACO_FILE"
+
+# Test if paco is to be used
+[[ ! "$USE_PACO" = "y" ]] && return
+
+# If the file exists in the archive copy it to the $BUILDDIR/sources dir.
+if [ ! -z ${SRC_ARCHIVE} ] &&
