diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index f0cd87452..ba496de4e 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -106,7 +106,8 @@
     <para>Now run the tests. Make sure the PATH in the <userinput>su</userinput>
     environment includes /tools/bin.</para>
 
-<screen><userinput remap="test">su nobody -s /bin/bash -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes -k check || true"</userinput></screen>
+<screen><userinput remap="test">su nobody -s /bin/bash \
+          -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes -k check || true"</userinput></screen>
 
     <para>Remove the temporary group:</para>
 
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index bddf4e570..87e113292 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -333,17 +333,20 @@ EOF</userinput></screen>
     <para>Install timezone data:</para>
 <screen><userinput>tar -xf ../tzdata&tzdata-version;.tar.gz
 
-mkdir -pv /usr/share/zoneinfo/{posix,right} 
+ZONEINFO=/usr/share/zoneinfo
+mkdir -pv $ZONEINFO/{posix,right} 
 
-for tz in etcetera southamerica northamerica europe africa antarctica \
-          asia australasia backward pacificnew solar87 solar88 solar89 systemv; do
-    zic -L /dev/null   -d /usr/share/zoneinfo       -y "sh yearistype.sh" ${tz} 
-    zic -L /dev/null   -d /usr/share/zoneinfo/posix -y "sh yearistype.sh" ${tz} 
-    zic -L leapseconds -d /usr/share/zoneinfo/right -y "sh yearistype.sh" ${tz}
+for tz in etcetera southamerica northamerica europe africa antarctica  \
+          asia australasia backward pacificnew solar87 solar88 solar89 \
+          systemv; do
+    zic -L /dev/null   -d $ZONEINFO       -y "sh yearistype.sh" ${tz} 
+    zic -L /dev/null   -d $ZONEINFO/posix -y "sh yearistype.sh" ${tz} 
+    zic -L leapseconds -d $ZONEINFO/right -y "sh yearistype.sh" ${tz}
 done
 
-cp -v zone.tab iso3166.tab /usr/share/zoneinfo 
-zic -d /usr/share/zoneinfo -p America/New_York</userinput></screen>
+cp -v zone.tab iso3166.tab $ZONEINFO
+zic -d $ZONEINFO -p America/New_York
+unset ZONEINFO</userinput></screen>
 
     <variablelist>
       <title>The meaning of the zic commands:</title>