diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 9c030ecbf..9dd5dd954 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -55,6 +55,12 @@
 </itemizedlist>
 </listitem>
 
+<listitem><para>January 27th, 2004 [alex]: Chapters 5 + 6 - Replaced 'build
+time' and 'disk space' texts with entities for esy change.</para></listitem>
+
+<listitem><para>January 26th, 2004 [alex]: Chapter 1 - Resources: Added links
+to the Wiki and the LFS-References page.</para></listitem>
+
 <listitem><para>January 25th, 2004 [greg]: Chapter 5 - Adding the user lfs:
 Added "-k /dev/null" to the useradd command to prevent /etc/skel files from
 coming across.</para></listitem>
diff --git a/chapter01/versions.xml b/chapter01/versions.xml
index da0b07a66..b8fd3d26e 100644
--- a/chapter01/versions.xml
+++ b/chapter01/versions.xml
@@ -3,7 +3,7 @@
 <?dbhtml filename="version.html" dir="chapter01"?>
 
 <para>This is version &version; of the Linux From Scratch book, dated
-&releasedate;. If this book is more than two months old, a newer and better
+&releasedate;. If this book is more than three months old, a newer and better
 version is probably already available. To find out, check one of the mirrors
 listed on <ulink url="http://www.linuxfromscratch.org/"/>.</para>
 
diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index 579e518a1..01fd720de 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -2,8 +2,8 @@
 <title>Installing Bash-&bash-version;</title>
 <?dbhtml filename="bash.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &bash-time-tools; 
-Estimated required disk space:  &bash-compsize-tools;</screen>
+<screen>&buildtime; &bash-time-tools; 
+&diskspace; &bash-compsize-tools;</screen>
 
 &aa-bash-down;
 &aa-bash-dep;
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index 15dc47cc1..00a824fd9 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -2,8 +2,8 @@
 <title>Installing Binutils-&binutils-version; - Pass 1</title>
 <?dbhtml filename="binutils-pass1.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &binutils-time-tools-pass1;
-Estimated required disk space:  &binutils-compsize-tools-pass1;</screen>
+<screen>&buildtime; &binutils-time-tools-pass1;
+&diskspace; &binutils-compsize-tools-pass1;</screen>
 
 &aa-binutils-down;
 &aa-binutils-dep;
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index de0280e47..36cb2f228 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -2,8 +2,8 @@
 <title>Installing Binutils-&binutils-version; - Pass 2</title>
 <?dbhtml filename="binutils-pass2.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &binutils-time-tools-pass2;
-Estimated required disk space:  &binutils-compsize-tools-pass2;</screen>
+<screen>&buildtime; &binutils-time-tools-pass2;
+&diskspace; &binutils-compsize-tools-pass2;</screen>
 
 &aa-binutils-down;
 &aa-binutils-dep;
diff --git a/chapter05/bzip2.xml b/chapter05/bzip2.xml
index fb65ad101..a7d0d1a1e 100644
--- a/chapter05/bzip2.xml
+++ b/chapter05/bzip2.xml
@@ -2,8 +2,8 @@
 <title>Installing Bzip2-&bzip2-version;</title>
 <?dbhtml filename="bzip2.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &bzip2-time-tools;
-Estimated required disk space:  &bzip2-compsize-tools;</screen>
+<screen>&buildtime; &bzip2-time-tools;
+&diskspace; &bzip2-compsize-tools;</screen>
 
 &aa-bzip2-down;
 &aa-bzip2-dep;
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index b49c41468..365fd3ef7 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -316,6 +316,18 @@ issue the following commands to add the new user:</para>
 <screen><userinput>useradd -s /bin/bash -m -k /dev/null lfs
 passwd lfs</userinput></screen>
 
+<para>The meaning of the switches:</para>
+
+<itemizedlist>
+<listitem><para><userinput>-s /bin/bash</userinput>: This makes
+<userinput>bash</userinput> the default shell for user
+<emphasis>lfs</emphasis>.</para></listitem>
+
+<listitem><para><userinput>-m -k /dev/null</userinput>: These create a home
+directory for <emphasis>lfs</emphasis>, while preventing the files from a
+possible <filename>/etc/skel</filename> being copied into it.</para></listitem>
+</itemizedlist>
+
 <para>Now grant this new user <emphasis>lfs</emphasis> full access to
 <filename class="directory">$LFS/tools</filename> by giving it ownership
 of the directory:</para>
diff --git a/chapter05/coreutils.xml b/chapter05/coreutils.xml
index bd273a6f7..a9c90c3e2 100644
--- a/chapter05/coreutils.xml
+++ b/chapter05/coreutils.xml
@@ -2,8 +2,8 @@
 <title>Installing Coreutils-&coreutils-version;</title>
 <?dbhtml filename="coreutils.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &coreutils-time-tools;
-Estimated required disk space:  &coreutils-compsize-tools;</screen>
+<screen>&buildtime; &coreutils-time-tools;
+&diskspace; &coreutils-compsize-tools;</screen>
 
 <literallayout>Official download location for Coreutils (&coreutils-version;):
 <ulink url="ftp://ftp.gnu.org/gnu/coreutils/"/>
diff --git a/chapter05/dejagnu.xml b/chapter05/dejagnu.xml
index d4b3143cc..e8b2b3cd7 100644
--- a/chapter05/dejagnu.xml
+++ b/chapter05/dejagnu.xml
@@ -4,8 +4,8 @@
 
 <para>The DejaGnu package contains a framework for testing other programs.</para>
 
-<screen>Estimated build time:           &dejagnu-time-tools; 
-Estimated required disk space:  &dejagnu-compsize-tools;</screen>
+<screen>&buildtime; &dejagnu-time-tools; 
+&diskspace; &dejagnu-compsize-tools;</screen>
 
 &aa-dejagnu-down;
 &aa-dejagnu-dep;
diff --git a/chapter05/diffutils.xml b/chapter05/diffutils.xml
index 2316576e5..123be7682 100644
--- a/chapter05/diffutils.xml
+++ b/chapter05/diffutils.xml
@@ -2,8 +2,8 @@
 <title>Installing Diffutils-&diffutils-version;</title>
 <?dbhtml filename="diffutils.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &diffutils-time-tools;
-Estimated required disk space:  &diffutils-compsize-tools;</screen>
+<screen>&buildtime; &diffutils-time-tools;
+&diskspace; &diffutils-compsize-tools;</screen>
 
 &aa-diffutils-down;
 &aa-diffutils-dep;
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index 1fdd78b4f..81a175a8a 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -5,8 +5,8 @@
 <para>The Expect package contains a program for doing scripted dialogues with
 other interactive programs.</para>
 
-<screen>Estimated build time:           &expect-time-tools; 
-Estimated required disk space:  &expect-compsize-tools;</screen>
+<screen>&buildtime; &expect-time-tools; 
+&diskspace; &expect-compsize-tools;</screen>
 
 &aa-expect-down;
 &aa-expect-dep;
diff --git a/chapter05/findutils.xml b/chapter05/findutils.xml
index 53fd69bc0..f91c4caa1 100644
--- a/chapter05/findutils.xml
+++ b/chapter05/findutils.xml
@@ -2,8 +2,8 @@
 <title>Installing Findutils-&findutils-version;</title>
 <?dbhtml filename="findutils.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &findutils-time-tools;
-Estimated required disk space:  &findutils-compsize-tools;</screen>
+<screen>&buildtime; &findutils-time-tools;
+&diskspace; &findutils-compsize-tools;</screen>
 
 &aa-findutils-down;
 &aa-findutils-dep;
diff --git a/chapter05/gawk.xml b/chapter05/gawk.xml
index 02c614071..a805e5d91 100644
--- a/chapter05/gawk.xml
+++ b/chapter05/gawk.xml
@@ -2,8 +2,8 @@
 <title>Installing Gawk-&gawk-version;</title>
 <?dbhtml filename="gawk.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &gawk-time-tools;
-Estimated required disk space:  &gawk-compsize-tools;</screen>
+<screen>&buildtime; &gawk-time-tools;
+&diskspace; &gawk-compsize-tools;</screen>
 
 <literallayout>Official download location for Gawk (&gawk-version;): 
 <ulink url="ftp://ftp.gnu.org/pub/gnu/gawk/"/></literallayout>
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 525da689f..cbd70989d 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -2,8 +2,8 @@
 <title>Installing GCC-&gcc-version; - Pass 1</title>
 <?dbhtml filename="gcc-pass1.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &gcc-time-tools-pass1;
-Estimated required disk space:  &gcc-compsize-tools-pass1;</screen>
+<screen>&buildtime; &gcc-time-tools-pass1;
+&diskspace; &gcc-compsize-tools-pass1;</screen>
 
 <literallayout>Official download location for GCC (&gcc-version;): 
 <ulink url="ftp://ftp.gnu.org/pub/gnu/gcc/"/></literallayout>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index f25add08b..145345399 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -2,8 +2,8 @@
 <title>Installing GCC-&gcc-version; - Pass 2</title>
 <?dbhtml filename="gcc-pass2.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &gcc-time-tools-pass2;
-Estimated required disk space:  &gcc-compsize-tools-pass2;</screen>
+<screen>&buildtime; &gcc-time-tools-pass2;
+&diskspace; &gcc-compsize-tools-pass2;</screen>
 
 &aa-gcc-down;
 &aa-gcc-dep;
diff --git a/chapter05/gettext.xml b/chapter05/gettext.xml
index 726e1d6e4..3229af9e6 100644
--- a/chapter05/gettext.xml
+++ b/chapter05/gettext.xml
@@ -2,8 +2,8 @@
 <title>Installing Gettext-&gettext-version;</title>
 <?dbhtml filename="gettext.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &gettext-time-tools;
-Estimated required disk space:  &gettext-compsize-tools;</screen>
+<screen>&buildtime; &gettext-time-tools;
+&diskspace; &gettext-compsize-tools;</screen>
 
 &aa-gettext-down;
 &aa-gettext-dep;
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 58f198917..67b99eb2a 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -2,8 +2,8 @@
 <title>Installing Glibc-&glibc-version;</title>
 <?dbhtml filename="glibc.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &glibc-time-tools;
-Estimated required disk space:  &glibc-compsize-tools;</screen>
+<screen>&buildtime; &glibc-time-tools;
+&diskspace; &glibc-compsize-tools;</screen>
 
 &aa-glibc-down;
 &aa-glibc-dep;
diff --git a/chapter05/grep.xml b/chapter05/grep.xml
index cdeff1166..9728609ee 100644
--- a/chapter05/grep.xml
+++ b/chapter05/grep.xml
@@ -2,8 +2,8 @@
 <title>Installing Grep-&grep-version;</title>
 <?dbhtml filename="grep.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &grep-time-tools;
-Estimated required disk space:  &grep-compsize-tools;</screen>
+<screen>&buildtime; &grep-time-tools;
+&diskspace; &grep-compsize-tools;</screen>
 
 &aa-grep-down;
 &aa-grep-dep;
diff --git a/chapter05/gzip.xml b/chapter05/gzip.xml
index 746be866e..cd9f13d14 100644
--- a/chapter05/gzip.xml
+++ b/chapter05/gzip.xml
@@ -2,8 +2,8 @@
 <title>Installing Gzip-&gzip-version;</title>
 <?dbhtml filename="gzip.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &gzip-time-tools;
-Estimated required disk space:  &gzip-compsize-tools;</screen>
+<screen>&buildtime; &gzip-time-tools;
+&diskspace; &gzip-compsize-tools;</screen>
 
 &aa-gzip-down;
 &aa-gzip-dep;
diff --git a/chapter05/kernelheaders.xml b/chapter05/kernelheaders.xml
index 8d4d2b40e..5bac98be5 100644
--- a/chapter05/kernelheaders.xml
+++ b/chapter05/kernelheaders.xml
@@ -2,8 +2,8 @@
 <title>Installing Linux-&kernel-version; headers</title>
 <?dbhtml filename="kernel-headers.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &kernel-time-headers;
-Estimated required disk space:  &kernel-compsize-headers;</screen>
+<screen>&buildtime; &kernel-time-headers;
+&diskspace; &kernel-compsize-headers;</screen>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/make.xml b/chapter05/make.xml
index a330b02fa..c166116b7 100644
--- a/chapter05/make.xml
+++ b/chapter05/make.xml
@@ -2,8 +2,8 @@
 <title>Installing Make-&make-version;</title>
 <?dbhtml filename="make.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &make-time-tools;
-Estimated required disk space:  &make-compsize-tools;</screen>
+<screen>&buildtime; &make-time-tools;
+&diskspace; &make-compsize-tools;</screen>
 
 &aa-make-down;
 &aa-make-dep;
diff --git a/chapter05/ncurses.xml b/chapter05/ncurses.xml
index 8fdbf856b..b7c71f2c6 100644
--- a/chapter05/ncurses.xml
+++ b/chapter05/ncurses.xml
@@ -2,8 +2,8 @@
 <title>Installing Ncurses-&ncurses-version;</title>
 <?dbhtml filename="ncurses.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &ncurses-time-tools;
-Estimated required disk space:  &ncurses-compsize-tools;</screen>
+<screen>&buildtime; &ncurses-time-tools;
+&diskspace; &ncurses-compsize-tools;</screen>
 
 &aa-ncurses-down;
 &aa-ncurses-dep;
diff --git a/chapter05/patch.xml b/chapter05/patch.xml
index f80e0aedd..fe3ff0e40 100644
--- a/chapter05/patch.xml
+++ b/chapter05/patch.xml
@@ -2,8 +2,8 @@
 <title>Installing Patch-&patch-version;</title>
 <?dbhtml filename="patch.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &patch-time-tools;
-Estimated required disk space:  &patch-compsize-tools;</screen>
+<screen>&buildtime; &patch-time-tools;
+&diskspace; &patch-compsize-tools;</screen>
 
 &aa-patch-down;
 &aa-patch-dep;
diff --git a/chapter05/perl.xml b/chapter05/perl.xml
index 81f619c21..20e3d2562 100644
--- a/chapter05/perl.xml
+++ b/chapter05/perl.xml
@@ -2,8 +2,8 @@
 <title>Installing Perl-&perl-version;</title>
 <?dbhtml filename="perl.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &perl-time-tools;
-Estimated required disk space:  &perl-compsize-tools;</screen>
+<screen>&buildtime; &perl-time-tools;
+&diskspace; &perl-compsize-tools;</screen>
 
 &aa-perl-down;
 &aa-perl-dep;
diff --git a/chapter05/sed.xml b/chapter05/sed.xml
index 297f788b9..abee6d58c 100644
--- a/chapter05/sed.xml
+++ b/chapter05/sed.xml
@@ -2,8 +2,8 @@
 <title>Installing Sed-&sed-version;</title>
 <?dbhtml filename="sed.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &sed-time-tools;
-Estimated required disk space:  &sed-compsize-tools;</screen>
+<screen>&buildtime; &sed-time-tools;
+&diskspace; &sed-compsize-tools;</screen>
 
 &aa-sed-down;
 &aa-sed-dep;
diff --git a/chapter05/tar.xml b/chapter05/tar.xml
index 422da02ad..4906cb51e 100644
--- a/chapter05/tar.xml
+++ b/chapter05/tar.xml
@@ -2,8 +2,8 @@
 <title>Installing Tar-&tar-version;</title>
 <?dbhtml filename="tar.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &tar-time-tools;
-Estimated required disk space:  &tar-compsize-tools;</screen>
+<screen>&buildtime; &tar-time-tools;
+&diskspace; &tar-compsize-tools;</screen>
 
 &aa-tar-down;
 &aa-tar-dep;
diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml
index 92250ecec..75f1338b8 100644
--- a/chapter05/tcl.xml
+++ b/chapter05/tcl.xml
@@ -4,8 +4,8 @@
 
 <para>The Tcl package contains the Tool Command Language.</para>
 
-<screen>Estimated build time:           &tcl-time-tools; 
-Estimated required disk space:  &tcl-compsize-tools;</screen>
+<screen>&buildtime; &tcl-time-tools; 
+&diskspace; &tcl-compsize-tools;</screen>
 
 &aa-tcl-down;
 &aa-tcl-dep;
diff --git a/chapter05/texinfo.xml b/chapter05/texinfo.xml
index 14bbcfba2..92b737105 100644
--- a/chapter05/texinfo.xml
+++ b/chapter05/texinfo.xml
@@ -2,8 +2,8 @@
 <title>Installing Texinfo-&texinfo-version;</title>
 <?dbhtml filename="texinfo.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &texinfo-time-tools;
-Estimated required disk space:  &texinfo-compsize-tools;</screen>
+<screen>&buildtime; &texinfo-time-tools;
+&diskspace; &texinfo-compsize-tools;</screen>
 
 &aa-texinfo-down;
 &aa-texinfo-dep;
diff --git a/chapter05/utillinux.xml b/chapter05/utillinux.xml
index 302255758..ba18e33e9 100644
--- a/chapter05/utillinux.xml
+++ b/chapter05/utillinux.xml
@@ -2,8 +2,8 @@
 <title>Installing Util-linux-&util-linux-version;</title>
 <?dbhtml filename="util-linux.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &util-linux-time-tools;
-Estimated required disk space:  &util-linux-compsize-tools;</screen>
+<screen>&buildtime; &util-linux-time-tools;
+&diskspace; &util-linux-compsize-tools;</screen>
 
 &aa-utillinux-down;
 &aa-utillinux-dep;
diff --git a/chapter06/autoconf.xml b/chapter06/autoconf.xml
index 315936118..5ec83dfc4 100644
--- a/chapter06/autoconf.xml
+++ b/chapter06/autoconf.xml
@@ -5,8 +5,8 @@
 <para>The Autoconf package contains programs for producing shell scripts that
 can automatically configure source code.</para>
 
-<screen>Estimated build time:           &autoconf-time;
-Estimated required disk space:  &autoconf-compsize;</screen>
+<screen>&buildtime; &autoconf-time;
+&diskspace; &autoconf-compsize;</screen>
 
 &aa-autoconf-down;
 &aa-autoconf-dep;
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index cf7f3a294..570373dde 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -5,8 +5,8 @@
 <para>The Automake package contains programs for generating Makefiles for use
 with Autoconf.</para>
 
-<screen>Estimated build time:           &automake-time;
-Estimated required disk space:  &automake-compsize;</screen>
+<screen>&buildtime; &automake-time;
+&diskspace; &automake-compsize;</screen>
 
 &aa-automake-down;
 &aa-automake-dep;
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 52e95dace..320eb06df 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -4,8 +4,8 @@
 
 <para>The Bash package contains the Bourne-Again SHell.</para>
 
-<screen>Estimated build time:           &bash-time;
-Estimated required disk space:  &bash-compsize;</screen>
+<screen>&buildtime; &bash-time;
+&diskspace; &bash-compsize;</screen>
 
 &aa-bash-down;
 &aa-bash-dep;
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 8a95589ac..5ace5b155 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -5,8 +5,8 @@
 <para>The Binutils package contains a linker, an assembler, and other tools for
 handling object files.</para>
 
-<screen>Estimated build time:           &binutils-time;
-Estimated required disk space:  &binutils-compsize;</screen>
+<screen>&buildtime; &binutils-time;
+&diskspace; &binutils-compsize;</screen>
 
 &aa-binutils-down;
 &aa-binutils-dep;
diff --git a/chapter06/bison.xml b/chapter06/bison.xml
index 17e298523..73ac90be5 100644
--- a/chapter06/bison.xml
+++ b/chapter06/bison.xml
@@ -4,8 +4,8 @@
 
 <para>The Bison package contains a parser generator.</para>
 
-<screen>Estimated build time:           &bison-time;
-Estimated required disk space:  &bison-compsize;</screen>
+<screen>&buildtime; &bison-time;
+&diskspace; &bison-compsize;</screen>
 
 &aa-bison-down;
 &aa-bison-dep;
diff --git a/chapter06/bootscripts.xml b/chapter06/bootscripts.xml
index fe9b32d83..e26fefba2 100644
--- a/chapter06/bootscripts.xml
+++ b/chapter06/bootscripts.xml
@@ -4,8 +4,8 @@
 
 <para>The LFS-Bootscripts package contains a set of bootscripts.</para>
 
-<screen>Estimated build time:           &bootscripts-time;
-Estimated required disk space:  &bootscripts-compsize;</screen>
+<screen>&buildtime; &bootscripts-time;
+&diskspace; &bootscripts-compsize;</screen>
 
 &aa-bootscripts-down;
 &aa-bootscripts-dep;
diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index da427ce5c..39a8207ce 100644
--- a/chapter06/bzip2.xml
+++ b/chapter06/bzip2.xml
@@ -6,8 +6,8 @@
 files. On text files they achieve a much better compression than the
 traditional <userinput>gzip</userinput>.</para>
 
-<screen>Estimated build time:           &bzip2-time;
-Estimated required disk space:  &bzip2-compsize;</screen>
+<screen>&buildtime; &bzip2-time;
+&diskspace; &bzip2-compsize;</screen>
 
 &aa-bzip2-down;
 &aa-bzip2-dep;
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 10ebcf631..8e1ab5faa 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -5,8 +5,8 @@
 <para>The Coreutils package contains utilities for showing and setting the
 basic system characteristics.</para>
 
-<screen>Estimated build time:           &coreutils-time;
-Estimated required disk space:  &coreutils-compsize;</screen>
+<screen>&buildtime; &coreutils-time;
+&diskspace; &coreutils-compsize;</screen>
 
 &aa-coreutils-down;
 &aa-coreutils-dep;
diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml
index 9222ac3d6..9d89b2f39 100644
--- a/chapter06/diffutils.xml
+++ b/chapter06/diffutils.xml
@@ -5,8 +5,8 @@
 <para>The Diffutils package contains programs that show the differences
 between files or directories.</para>
 
-<screen>Estimated build time:           &diffutils-time;
-Estimated required disk space:  &diffutils-compsize;</screen>
+<screen>&buildtime; &diffutils-time;
+&diskspace; &diffutils-compsize;</screen>
 
 &aa-diffutils-down;
 &aa-diffutils-dep;
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index ed22a5389..f8904de39 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -5,8 +5,8 @@
 <para>The E2fsprogs package contains the utilities for handling the ext2
 filesystem. It also supports the ext3 journaling filesystem.</para>
 
-<screen>Estimated build time:           &e2fsprogs-time;
-Estimated required disk space:  &e2fsprogs-compsize;</screen>
+<screen>&buildtime; &e2fsprogs-time;
+&diskspace; &e2fsprogs-compsize;</screen>
 
 &aa-e2fsprogs-down;
 &aa-e2fsprogs-dep;
diff --git a/chapter06/ed.xml b/chapter06/ed.xml
index 489571e20..b240ef281 100644
--- a/chapter06/ed.xml
+++ b/chapter06/ed.xml
@@ -4,8 +4,8 @@
 
 <para>The Ed package contains a spartan line editor.</para>
 
-<screen>Estimated build time:           &ed-time;
-Estimated required disk space:  &ed-compsize;</screen>
+<screen>&buildtime; &ed-time;
+&diskspace; &ed-compsize;</screen>
 
 &aa-ed-down;
 &aa-ed-dep;
diff --git a/chapter06/file.xml b/chapter06/file.xml
index ad992f8a6..cd37b589b 100644
--- a/chapter06/file.xml
+++ b/chapter06/file.xml
@@ -4,8 +4,8 @@
 
 <para>The File package contains a utility for determining the type of files.</para>
 
-<screen>Estimated build time:           &file-time;
-Estimated required disk space:  &file-compsize;</screen>
+<screen>&buildtime; &file-time;
+&diskspace; &file-compsize;</screen>
 
 &aa-file-down;
 &aa-file-dep;
diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml
index 1041a20ab..236f78a9e 100644
--- a/chapter06/findutils.xml
+++ b/chapter06/findutils.xml
@@ -6,8 +6,8 @@
 done either by doing a live recursive search through a directory tree, or by
 consulting a previously set up database.</para>
 
-<screen>Estimated build time:           &findutils-time;
-Estimated required disk space:  &findutils-compsize;</screen>
+<screen>&buildtime; &findutils-time;
+&diskspace; &findutils-compsize;</screen>
 
 &aa-findutils-down;
 &aa-findutils-dep;
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index e4e8c51b1..64bd2068f 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -5,8 +5,8 @@
 <para>The Flex package contains a utility for generating programs that
 recognize patterns in text.</para>
 
-<screen>Estimated build time:           &flex-time;
-Estimated required disk space:  &flex-compsize;</screen>
+<screen>&buildtime; &flex-time;
+&diskspace; &flex-compsize;</screen>
 
 &aa-flex-down;
 &aa-flex-dep;
diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml
index cd6755d04..8a1c3eecc 100644
--- a/chapter06/gawk.xml
+++ b/chapter06/gawk.xml
@@ -4,8 +4,8 @@
 
 <para>The Gawk package contains programs for manipulating text files.</para>
 
-<screen>Estimated build time:           &gawk-time;
-Estimated required disk space:  &gawk-compsize;</screen>
+<screen>&buildtime; &gawk-time;
+&diskspace; &gawk-compsize;</screen>
 
 &aa-gawk-down;
 &aa-gawk-dep;
diff --git a/chapter06/gcc-2953.xml b/chapter06/gcc-2953.xml
index 0afb56167..19f7aa18b 100644
--- a/chapter06/gcc-2953.xml
+++ b/chapter06/gcc-2953.xml
@@ -2,8 +2,8 @@
 <title>Installing GCC-2.95.3</title>
 <?dbhtml filename="gcc-2953.html" dir="chapter06"?>
 
-<screen>Estimated build time:           &gcc-2953-time;
-Estimated required disk space:  &gcc-2953-compsize;</screen>
+<screen>&buildtime; &gcc-2953-time;
+&diskspace; &gcc-2953-compsize;</screen>
 
 <sect2><title></title>
 <literallayout>Official download location for GCC-2 (&gcc-2953-version;): 
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index f234fd891..b6d311e36 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -5,8 +5,8 @@
 <para>The GCC package contains the GNU compiler collection, among them
 the C and C++ compilers.</para>
 
-<screen>Estimated build time:           &gcc-time;
-Estimated required disk space:  &gcc-compsize;</screen>
+<screen>&buildtime; &gcc-time;
+&diskspace; &gcc-compsize;</screen>
 
 <literallayout>Official download location for GCC (&gcc-version;): 
 <ulink url="ftp://ftp.gnu.org/pub/gnu/gcc/"/>
diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml
index e8ae88eca..fc8afca68 100644
--- a/chapter06/gettext.xml
+++ b/chapter06/gettext.xml
@@ -6,8 +6,8 @@
 localization. These allow programs to be compiled with Native Language Support
 (NLS), enabling them to output messages in the user's native language.</para>
 
-<screen>Estimated build time:           &gettext-time;
-Estimated required disk space:  &gettext-compsize;</screen>
+<screen>&buildtime; &gettext-time;
+&diskspace; &gettext-compsize;</screen>
 
 &aa-gettext-down;
 &aa-gettext-dep;
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 1a1cce808..abe6647d2 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -7,8 +7,8 @@ the basic routines for allocating memory, searching directories, opening and
 closing files, reading and writing them, string handling, pattern matching,
 arithmetic, and so on.</para>
 
-<screen>Estimated build time:           &glibc-time;
-Estimated required disk space:  &glibc-compsize;</screen>
+<screen>&buildtime; &glibc-time;
+&diskspace; &glibc-compsize;</screen>
 
 &aa-glibc-down;
 &aa-glibc-dep;
diff --git a/chapter06/grep.xml b/chapter06/grep.xml
index 771b21deb..55e33e16f 100644
--- a/chapter06/grep.xml
+++ b/chapter06/grep.xml
@@ -4,8 +4,8 @@
 
 <para>The Grep package contains programs for searching through files.</para>
 
-<screen>Estimated build time:           &grep-time;
-Estimated required disk space:  &grep-compsize;</screen>
+<screen>&buildtime; &grep-time;
+&diskspace; &grep-compsize;</screen>
 
 &aa-grep-down;
 &aa-grep-dep;
diff --git a/chapter06/groff.xml b/chapter06/groff.xml
index 18cfbcbde..39fa8bc1c 100644
--- a/chapter06/groff.xml
+++ b/chapter06/groff.xml
@@ -4,8 +4,8 @@
 
 <para>The Groff package contains programs for processing and formatting text.</para>
 
-<screen>Estimated build time:           &groff-time;
-Estimated required disk space:  &groff-compsize;</screen>
+<screen>&buildtime; &groff-time;
+&diskspace; &groff-compsize;</screen>
 
 &aa-groff-down;
 &aa-groff-dep;
diff --git a/chapter06/grub.xml b/chapter06/grub.xml
index cf31362e2..e51073d04 100644
--- a/chapter06/grub.xml
+++ b/chapter06/grub.xml
@@ -4,8 +4,8 @@
 
 <para>The Grub package contains the GRand Unified Bootloader.</para>
 
-<screen>Estimated build time:           &grub-time;
-Estimated required disk space:  &grub-compsize;</screen>
+<screen>&buildtime; &grub-time;
+&diskspace; &grub-compsize;</screen>
 
 &aa-grub-down;
 &aa-grub-dep;
diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml
index 295c4a6c8..ba5d19083 100644
--- a/chapter06/gzip.xml
+++ b/chapter06/gzip.xml
@@ -5,8 +5,8 @@
 <para>The Gzip package contains programs for compressing and decompressing
 files.</para>
 
-<screen>Estimated build time:           &gzip-time;
-Estimated required disk space:  &gzip-compsize;</screen>
+<screen>&buildtime; &gzip-time;
+&diskspace; &gzip-compsize;</screen>
 
 &aa-gzip-down;
 &aa-gzip-dep;
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index d78416bcd..4dfb7edbd 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -4,8 +4,8 @@
 
 <para>The Inetutils package contains programs for basic networking.</para>
 
-<screen>Estimated build time:           &inetutils-time;
-Estimated required disk space:  &inetutils-compsize;</screen>
+<screen>&buildtime; &inetutils-time;
+&diskspace; &inetutils-compsize;</screen>
 
 &aa-inetutils-down;
 &aa-inetutils-dep;
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index bb39ab2e3..a3c5a6a5d 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -4,8 +4,8 @@
 
 <para>The Kbd package contains keytable files and keyboard utilities.</para>
 
-<screen>Estimated build time:           &kbd-time;
-Estimated required disk space:  &kbd-compsize;</screen>
+<screen>&buildtime; &kbd-time;
+&diskspace; &kbd-compsize;</screen>
 
 &aa-kbd-down;
 &aa-kbd-dep;
diff --git a/chapter06/kernel.xml b/chapter06/kernel.xml
index 91f4cbaee..bcc993747 100644
--- a/chapter06/kernel.xml
+++ b/chapter06/kernel.xml
@@ -2,8 +2,8 @@
 <title>Installing Linux-&kernel-version; headers</title>
 <?dbhtml filename="kernel.html" dir="chapter06"?>
 
-<screen>Estimated build time:           &kernel-time-headers;
-Estimated required disk space:  &kernel-compsize-headers;</screen>
+<screen>&buildtime; &kernel-time-headers;
+&diskspace; &kernel-compsize-headers;</screen>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/less.xml b/chapter06/less.xml
index fd6bac9bc..4806ea701 100644
--- a/chapter06/less.xml
+++ b/chapter06/less.xml
@@ -4,8 +4,8 @@
 
 <para>The Less package contains a text file viewer.</para>
 
-<screen>Estimated build time:           &less-time;
-Estimated required disk space:  &less-compsize;</screen>
+<screen>&buildtime; &less-time;
+&diskspace; &less-compsize;</screen>
 
 &aa-less-down;
 &aa-less-dep;
diff --git a/chapter06/lfs-utils.xml b/chapter06/lfs-utils.xml
index 282a79fc6..0d329b764 100644
--- a/chapter06/lfs-utils.xml
+++ b/chapter06/lfs-utils.xml
@@ -4,8 +4,8 @@
 
 <para>The Lfs-Utils package contains a few helper files.</para>
 
-<screen>Estimated build time:           &lfs-utils-time;
-Estimated required disk space:  &lfs-utils-compsize;</screen>
+<screen>&buildtime; &lfs-utils-time;
+&diskspace; &lfs-utils-compsize;</screen>
 
 &aa-lfs-utils-down;
 &aa-lfs-utils-dep;
diff --git a/chapter06/libtool.xml b/chapter06/libtool.xml
index 112107ee3..af0ede375 100644
--- a/chapter06/libtool.xml
+++ b/chapter06/libtool.xml
@@ -6,8 +6,8 @@
 It wraps the complexity of using shared libraries in a consistent, portable
 interface.</para>
 
-<screen>Estimated build time:           &libtool-time;
-Estimated required disk space:  &libtool-compsize;</screen>
+<screen>&buildtime; &libtool-time;
+&diskspace; &libtool-compsize;</screen>
 
 &aa-libtool-down;
 &aa-libtool-dep;
diff --git a/chapter06/m4.xml b/chapter06/m4.xml
index 84bfc8400..a01f4d8c8 100644
--- a/chapter06/m4.xml
+++ b/chapter06/m4.xml
@@ -4,8 +4,8 @@
 
 <para>The M4 package contains a macro processor.</para>
 
-<screen>Estimated build time:           &m4-time;
-Estimated required disk space:  &m4-compsize;</screen>
+<screen>&buildtime; &m4-time;
+&diskspace; &m4-compsize;</screen>
 
 &aa-m4-down;
 &aa-m4-dep;
diff --git a/chapter06/make.xml b/chapter06/make.xml
index 346a5dc12..626b574d2 100644
--- a/chapter06/make.xml
+++ b/chapter06/make.xml
@@ -4,8 +4,8 @@
 
 <para>The Make package contains a program for compiling large packages.</para>
 
-<screen>Estimated build time:           &make-time;
-Estimated required disk space:  &make-compsize;</screen>
+<screen>&buildtime; &make-time;
+&diskspace; &make-compsize;</screen>
 
 &aa-make-down;
 &aa-make-dep;
diff --git a/chapter06/makedev.xml b/chapter06/makedev.xml
index 8a828cec5..320aa9057 100644
--- a/chapter06/makedev.xml
+++ b/chapter06/makedev.xml
@@ -4,8 +4,8 @@
 
 <para>The MAKEDEV package contains a script for making device nodes.</para>
 
-<screen>Estimated build time:           &makedev-time;
-Estimated required disk space:  &makedev-compsize;</screen>
+<screen>&buildtime; &makedev-time;
+&diskspace; &makedev-compsize;</screen>
 
 &aa-makedev-down;
 &aa-makedev-dep;
diff --git a/chapter06/man.xml b/chapter06/man.xml
index a031c5273..2f370f01a 100644
--- a/chapter06/man.xml
+++ b/chapter06/man.xml
@@ -4,8 +4,8 @@
 
 <para>The Man package contains programs for finding and viewing manual pages.</para>
 
-<screen>Estimated build time:           &man-time;
-Estimated required disk space:  &man-compsize;</screen>
+<screen>&buildtime; &man-time;
+&diskspace; &man-compsize;</screen>
 
 &aa-man-down;
 &aa-man-dep;
diff --git a/chapter06/manpages.xml b/chapter06/manpages.xml
index c0f4fc979..e80d6ecb6 100644
--- a/chapter06/manpages.xml
+++ b/chapter06/manpages.xml
@@ -4,8 +4,8 @@
 
 <para>The Man-pages package contains over 1200 manual pages.</para>
 
-<screen>Estimated build time:           &man-pages-time;
-Estimated required disk space:  &man-pages-compsize;</screen>
+<screen>&buildtime; &man-pages-time;
+&diskspace; &man-pages-compsize;</screen>
 
 &aa-manpages-down;
 &aa-manpages-dep;
diff --git a/chapter06/modutils.xml b/chapter06/modutils.xml
index 2103a4f19..99408f65a 100644
--- a/chapter06/modutils.xml
+++ b/chapter06/modutils.xml
@@ -4,8 +4,8 @@
 
 <para>The Modutils package contains programs for handling kernel modules.</para>
 
-<screen>Estimated build time:           &modutils-time;
-Estimated required disk space:  &modutils-compsize;</screen>
+<screen>&buildtime; &modutils-time;
+&diskspace; &modutils-compsize;</screen>
 
 &aa-modutils-down;
 &aa-modutils-dep;
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index 0b044b362..c824b4bac 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -5,8 +5,8 @@
 <para>The Ncurses package contains libraries for the terminal-independent
 handling of character screens.</para>
 
-<screen>Estimated build time:           &ncurses-time;
-Estimated required disk space:  &ncurses-compsize;</screen>
+<screen>&buildtime; &ncurses-time;
+&diskspace; &ncurses-compsize;</screen>
 
 &aa-ncurses-down;
 &aa-ncurses-dep;
diff --git a/chapter06/nettools.xml b/chapter06/nettools.xml
index e846df1cc..47ddf958a 100644
--- a/chapter06/nettools.xml
+++ b/chapter06/nettools.xml
@@ -4,8 +4,8 @@
 
 <para>The Net-tools package contains programs for basic networking.</para>
 
-<screen>Estimated build time:           &net-tools-time;
-Estimated required disk space:  &net-tools-compsize;</screen>
+<screen>&buildtime; &net-tools-time;
+&diskspace; &net-tools-compsize;</screen>
 
 &aa-nettools-down;
 &aa-nettools-dep;
diff --git a/chapter06/patch.xml b/chapter06/patch.xml
index 1692c4d70..d1e5b2bf5 100644
--- a/chapter06/patch.xml
+++ b/chapter06/patch.xml
@@ -4,8 +4,8 @@
 
 <para>The Patch package contains a program for modifying files.</para>
 
-<screen>Estimated build time:           &patch-time;
-Estimated required disk space:  &patch-compsize;</screen>
+<screen>&buildtime; &patch-time;
+&diskspace; &patch-compsize;</screen>
 
 &aa-patch-down;
 &aa-patch-dep;
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index e96ce49d0..761e433a1 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -4,8 +4,8 @@
 
 <para>The Perl package contains the Practical Extraction and Report Language.</para>
 
-<screen>Estimated build time:           &perl-time;
-Estimated required disk space:  &perl-compsize;</screen>
+<screen>&buildtime; &perl-time;
+&diskspace; &perl-compsize;</screen>
 
 <literallayout>Official download location for Perl (&perl-version;):
 <ulink url="http://www.perl.com/"/></literallayout>
diff --git a/chapter06/procinfo.xml b/chapter06/procinfo.xml
index cb3e097ea..443d5a4d0 100644
--- a/chapter06/procinfo.xml
+++ b/chapter06/procinfo.xml
@@ -4,8 +4,8 @@
 
 <para>The Procinfo package contains programs for displaying system information.</para>
 
-<screen>Estimated build time:           &procinfo-time;
-Estimated required disk space:  &procinfo-compsize;</screen>
+<screen>&buildtime; &procinfo-time;
+&diskspace; &procinfo-compsize;</screen>
 
 &aa-procinfo-down;
 &aa-procinfo-dep;
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index a5e8864d8..c823617b0 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -4,8 +4,8 @@
 
 <para>The Procps package contains programs for monitoring processes.</para>
 
-<screen>Estimated build time:           &procps-time;
-Estimated required disk space:  &procps-compsize;</screen>
+<screen>&buildtime; &procps-time;
+&diskspace; &procps-compsize;</screen>
 
 &aa-procps-down;
 &aa-procps-dep;
diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml
index 307d0252c..18d5425b2 100644
--- a/chapter06/psmisc.xml
+++ b/chapter06/psmisc.xml
@@ -5,8 +5,8 @@
 <para>The Psmisc package contains programs for displaying information on
 processes.</para>
 
-<screen>Estimated build time:           &psmisc-time;
-Estimated required disk space:  &psmisc-compsize;</screen>
+<screen>&buildtime; &psmisc-time;
+&diskspace; &psmisc-compsize;</screen>
 
 &aa-psmisc-down;
 &aa-psmisc-dep;
diff --git a/chapter06/sed.xml b/chapter06/sed.xml
index 2e684a89a..77e822c6b 100644
--- a/chapter06/sed.xml
+++ b/chapter06/sed.xml
@@ -4,8 +4,8 @@
 
 <para>The Sed package contains a stream editor.</para>
 
-<screen>Estimated build time:           &sed-time;
-Estimated required disk space:  &sed-compsize;</screen>
+<screen>&buildtime; &sed-time;
+&diskspace; &sed-compsize;</screen>
 
 &aa-sed-down;
 &aa-sed-dep;
diff --git a/chapter06/shadowpwd.xml b/chapter06/shadowpwd.xml
index a89df4002..d63adc7f6 100644
--- a/chapter06/shadowpwd.xml
+++ b/chapter06/shadowpwd.xml
@@ -5,8 +5,8 @@
 <para>The Shadow package contains programs for handling passwords in a secure
 way.</para>
 
-<screen>Estimated build time:           &shadow-time;
-Estimated required disk space:  &shadow-compsize;</screen>
+<screen>&buildtime; &shadow-time;
+&diskspace; &shadow-compsize;</screen>
 
 &aa-shadowpwd-down;
 &aa-shadowpwd-dep;
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
index 9a472bf4c..98a94bc26 100644
--- a/chapter06/sysklogd.xml
+++ b/chapter06/sysklogd.xml
@@ -5,8 +5,8 @@
 <para>The Sysklogd package contains programs for logging system messages, such
 as those given by the kernel when unusual things happen.</para>
 
-<screen>Estimated build time:           &sysklogd-time;
-Estimated required disk space:  &sysklogd-compsize;</screen>
+<screen>&buildtime; &sysklogd-time;
+&diskspace; &sysklogd-compsize;</screen>
 
 &aa-sysklogd-down;
 &aa-sysklogd-dep;
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index 4ff4cf791..f25cfdf27 100644
--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@@ -5,8 +5,8 @@
 <para>The Sysvinit package contains programs for controlling the startup,
 running, and shutdown of your system.</para>
 
-<screen>Estimated build time:           &sysvinit-time;
-Estimated required disk space:  &sysvinit-compsize;</screen>
+<screen>&buildtime; &sysvinit-time;
+&diskspace; &sysvinit-compsize;</screen>
 
 &aa-sysvinit-down;
 &aa-sysvinit-dep;
diff --git a/chapter06/tar.xml b/chapter06/tar.xml
index 310411b52..131d7c84a 100644
--- a/chapter06/tar.xml
+++ b/chapter06/tar.xml
@@ -4,8 +4,8 @@
 
 <para>The Tar package contains an archiving program.</para>
 
-<screen>Estimated build time:           &tar-time;
-Estimated required disk space:  &tar-compsize;</screen>
+<screen>&buildtime; &tar-time;
+&diskspace; &tar-compsize;</screen>
 
 &aa-tar-down;
 &aa-tar-dep;
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 1884a7080..45a416ce3 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -5,8 +5,8 @@
 <para>The Texinfo package contains programs for reading, writing, and
 converting Info documents.</para>
 
-<screen>Estimated build time:           &texinfo-time;
-Estimated required disk space:  &texinfo-compsize;</screen>
+<screen>&buildtime; &texinfo-time;
+&diskspace; &texinfo-compsize;</screen>
 
 &aa-texinfo-down;
 &aa-texinfo-dep;
diff --git a/chapter06/utillinux.xml b/chapter06/utillinux.xml
index 1ff0bb410..655c3d5c2 100644
--- a/chapter06/utillinux.xml
+++ b/chapter06/utillinux.xml
@@ -6,8 +6,8 @@
 them are utilities for handling filesystems, consoles, partitions, and
 messages.</para>
 
-<screen>Estimated build time:           &util-linux-time;
-Estimated required disk space:  &util-linux-compsize;</screen>
+<screen>&buildtime; &util-linux-time;
+&diskspace; &util-linux-compsize;</screen>
 
 &aa-utillinux-down;
 &aa-utillinux-dep;
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index e4ab8dba2..fcd6e9b96 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -4,8 +4,8 @@
 
 <para>The Vim package contains a powerful text editor.</para>
 
-<screen>Estimated build time:           &vim-time;
-Estimated required disk space:  &vim-compsize;</screen>
+<screen>&buildtime; &vim-time;
+&diskspace; &vim-compsize;</screen>
 
 &aa-vim-down;
 &aa-vim-dep;
diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index e0b63e3ec..a3527a819 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -5,8 +5,8 @@
 <para>The Zlib package contains compression and uncompression routines used by
 some programs.</para>
 
-<screen>Estimated build time:           &zlib-time;
-Estimated required disk space:  &zlib-compsize;</screen>
+<screen>&buildtime; &zlib-time;
+&diskspace; &zlib-compsize;</screen>
 
 &aa-zlib-down;
 &aa-zlib-dep;
diff --git a/index.xml b/index.xml
index 024f7ec73..d922d3590 100644
--- a/index.xml
+++ b/index.xml
@@ -21,6 +21,10 @@
 <!ENTITY all-size-version "cvs-2003-10-06">
 <!ENTITY all-size-mb "134 MB">
 
+<!ENTITY buildtime "Approximate build time: ">
+<!ENTITY diskspace "Required disk space:    ">
+
+
 <!ENTITY book SYSTEM "book.xml">
 <!ENTITY bookinfo SYSTEM "bookinfo.xml">