diff --git a/LFS/lfs.xsl b/LFS/lfs.xsl
index b6d562d..2906c35 100644
--- a/LFS/lfs.xsl
+++ b/LFS/lfs.xsl
@@ -44,8 +44,13 @@
   </xsl:template>
 
   <xsl:template match="sect1">
-    <xsl:if test="count(descendant::screen/userinput) &gt; 0 and
-      count(descendant::screen/userinput) &gt; count(descendant::screen[@role='nodump'])">
+    <xsl:if test="(../@id='chapter-temporary-tools' or
+                  ../@id='chapter-building-system' or
+                  ../@id='chapter-bootscripts' or
+                  ../@id='chapter-bootable') and
+                  count(descendant::screen/userinput) &gt; 0 and
+                  count(descendant::screen/userinput) &gt;
+                  count(descendant::screen[@role='nodump'])">
         <!-- The dirs names -->
       <xsl:variable name="pi-dir" select="../processing-instruction('dbhtml')"/>
       <xsl:variable name="pi-dir-value" select="substring-after($pi-dir,'dir=')"/>
diff --git a/LFS/master.sh b/LFS/master.sh
index 2270629..fe34737 100644
--- a/LFS/master.sh
+++ b/LFS/master.sh
@@ -281,25 +281,19 @@ chapter6_Makefiles() {
 }
 
 #----------------------------#
-chapter789_Makefiles() {
+chapter78_Makefiles() {
 #----------------------------#
-  echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter7/8/9 ( BOOT ) ${R_arrow}"
+  echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter7/8 ( BOOT ) ${R_arrow}"
 
-  for file in chapter0{7,8,9}/* ; do
+  for file in chapter0{7,8}/* ; do
     # Keep the script file name
     this_script=`basename $file`
 
     # Grub must be configured manually.
-    # The filesystems can't be unmounted via Makefile and the user
-    # should enter the chroot environment to create the root
-    # password, edit several files and setup Grub.
-    #
+    # Handle fstab creation.
     # If no .config file is supplied, the kernel build is skipped
-    #
     case ${this_script} in
       *grub)    continue ;;
-      *reboot)  continue ;;
-      *console) continue  ;; # Use the file generated by lfs-bootscripts
       *fstab)   [[ ! -z ${FSTAB} ]] && cp ${FSTAB} $BUILDDIR/sources/fstab ;;
       *kernel)  [[ -z ${CONFIG} ]] && continue
                 cp ${CONFIG} $BUILDDIR/sources/kernel-config  ;;
@@ -307,7 +301,7 @@ chapter789_Makefiles() {
 
     # First append each name of the script files to a list (this will become
     # the names of the targets in the Makefile
-    chapter789="$chapter789 ${this_script}"
+    chapter78="$chapter78 ${this_script}"
 
     #--------------------------------------------------------------------#
     #         >>>>>>>> START BUILDING A Makefile ENTRY <<<<<<<<          #
@@ -358,7 +352,7 @@ chapter789_Makefiles() {
 
     # Keep the script file name for Makefile dependencies.
     PREV=${this_script}
-  done  # for file in chapter0{7,8,9}/*
+  done  # for file in chapter0{7,8}/*
 
 }
 
@@ -380,7 +374,7 @@ build_Makefile() {           #
   chapter6_Makefiles
   # Add the iterations targets, if needed
   [[ "$COMPARE" = "y" ]] && wrt_compare_targets
-  chapter789_Makefiles
+  chapter78_Makefiles
   # Add the BLFS_TOOL targets, if needed
   [[ "$BLFS_TOOL" = "y" ]] && wrt_blfs_tool_targets
 
@@ -415,6 +409,7 @@ build_Makefile() {           #
 
 all:	ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT create-sbu_du-report mk_BLFS_TOOL
 	@sudo make do_housekeeping
+	@sudo echo "$VERSION - jhalfs build" > \$(MOUNT_PT)/etc/lfs-release
 	@\$(call echo_finished,$VERSION)
 
 ck_UID:
@@ -453,7 +448,7 @@ mk_CHROOT: mk_SUDO
 	  ln -sf /tools/bin/bash bash; ln -sf bash sh; \\
 	  sudo chown -R 0:0 \$(MOUNT_PT)/bin; \\
 	fi;
-	@sudo sed -e 's|^ln -sv |ln -svf |' -i \$(CMDSDIR)/chapter06/063-createfiles
+	@sudo sed -e 's|^ln -sv |ln -svf |' -i \$(CMDSDIR)/chapter06/*-createfiles
 	@\$(call echo_CHROOT_request)
 	@( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT")
 	@touch \$@
@@ -476,7 +471,7 @@ SETUP:     $chapter4
 LUSER:     $chapter5
 SUDO:      $runasroot
 CHROOT:    $chapter6
-BOOT:      $chapter789
+BOOT:      $chapter78
 BLFS_TOOL: $blfs_tool