diff --git a/dump-lfs-scripts.xsl b/dump-lfs-scripts.xsl
index 7648741..3a2017a 100644
--- a/dump-lfs-scripts.xsl
+++ b/dump-lfs-scripts.xsl
@@ -174,6 +174,9 @@
 
   <xsl:template match="replaceable">
     <xsl:choose>
+      <xsl:when test="ancestor::sect1[@id='ch-system-glibc']">
+        <xsl:text>$TIMEZONE</xsl:text>
+      </xsl:when>
       <xsl:when test="ancestor::sect1[@id='ch-system-groff']">
         <xsl:text>$PAGE</xsl:text>
       </xsl:when>
diff --git a/functions b/functions
index dec6f8d..dd81562 100644
--- a/functions
+++ b/functions
@@ -32,8 +32,6 @@ define echo_finished
   @echo
   @echo -e \\t- Set a password for the root user
   @echo
-  @echo -e \\t- Set your local time zone. See chapter06/glibc.html
-  @echo
   @echo -e \\t- Edit /etc/fstab, /etc/hosts, /etc/sysconfig/clock,
   @echo -e \\t/etc/sysconfig/console, /etc/sysconfig/network,
   @echo -e \\t/etc/sysconfig/ifconfig.eth0/ipv4 and any other configuration
diff --git a/jhalfs b/jhalfs
index bf579ee..d0bc74a 100755
--- a/jhalfs
+++ b/jhalfs
@@ -606,6 +606,16 @@ EOF
 ) >> $MKFILE.tmp
     fi
 
+    # For Glibc we need to set TIMEZONE envar.
+    if [ "$i" = "066-glibc" ] ; then
+(
+    cat << EOF
+	@echo "TIMEZONE=\$(TIMEZONE)" >> envars && \\
+	echo "export TIMEZONE" >> envars
+EOF
+) >> $MKFILE.tmp
+    fi
+
     # For Groff we need to set PAGE envar.
     if [ "$i" = "082-groff" ] ; then
 (
@@ -781,6 +791,7 @@ $HEADER
 SRC= /sources
 LFS= $BUILDDIR
 PAGE= $PAGE
+TIMEZONE= $TIMEZONE
 
 include functions