diff --git a/CLFS2/clfs2.xsl b/CLFS2/clfs2.xsl
index d858e8e..07e158d 100644
--- a/CLFS2/clfs2.xsl
+++ b/CLFS2/clfs2.xsl
@@ -138,10 +138,11 @@
 
   <xsl:template match="replaceable">
     <xsl:choose>
-      <xsl:when test="ancestor::sect1[@id='ch-system-glibc']">
+      <xsl:when test="ancestor::sect1[@id='ch-cross-tools-glibc']">
         <xsl:value-of select="$timezone"/>
       </xsl:when>
-      <xsl:when test="ancestor::sect1[@id='ch-system-groff']">
+      <xsl:when test="ancestor::sect1[@id='ch-cross-tools-groff'] or
+                      ancestor::sect1[@id='ch-system-groff']">
         <xsl:value-of select="$page"/>
       </xsl:when>
       <xsl:when test="ancestor::sect1[@id='ch-bootable-kernel']">
diff --git a/CLFS2/master.sh b/CLFS2/master.sh
index b1c6fba..381849f 100755
--- a/CLFS2/master.sh
+++ b/CLFS2/master.sh
@@ -182,7 +182,7 @@ cross_tools_Makefiles() {     #
     esac
     #
     # Set the dependency for the first target.
-    if [ -z $PREV ] ; then PREV=026-settingenvironment ; fi
+    if [ -z $PREV ] ; then PREV=028-creating-sysfile ; fi
 
     # First append each name of the script files to a list (this will become
     # the names of the targets in the Makefile