  ${BOLD}  -O, --optimize${OFF}
          Optimize [0-2]
            0 = no optimization
-@@ -696,6 +699,7 @@
+@@ -706,6 +709,7 @@
                   --stringparam page $PAGE \
                   --stringparam lang $LANG \
-                  --stringparam keymap ${KEYMAP:-"none"} \
+                  --stringparam keymap $KEYMAP \
 +                 --stringparam use_paco $USE_PACO \
                   -o ./${PROGNAME}-commands/ $XSL $BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1
        ;;
  
-@@ -723,6 +727,7 @@
+@@ -733,6 +737,7 @@
                   --stringparam lc_all $LC_ALL \
-                  --stringparam keymap ${KEYMAP:-"none"} \
+                  --stringparam keymap $KEYMAP \
                   --stringparam grsecurity_host $GRSECURITY_HOST \
 +                 --stringparam use_paco $USE_PACO \
                   -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
        ;;
      lfs)
-@@ -735,6 +740,7 @@
+@@ -745,6 +750,7 @@
                   --stringparam timezone $TIMEZONE \
                   --stringparam page $PAGE \
                   --stringparam lang $LANG \

                  -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
       ;;
     *) exit 1 ;;
@@ -801,6 +807,9 @@
     # Generate URLs file
   create_urls
 

     # Housekeeping...remove any build directory(ies) except if the package build fails.
Index: CLFS/clfs.xsl
===================================================================
--- CLFS/clfs.xsl	(revision 3007)
+++ CLFS/clfs.xsl	(working copy)
@@ -45,6 +45,9 @@
   <!-- Locale settings -->
   <xsl:param name="lang" select="C"/>
 
+  <!-- Use paco? -->
+  <xsl:param name="use_paco" select="y"/>
+
   <xsl:template match="/">
     <xsl:apply-templates select="//sect1"/>
