diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 4e7265963..ca39d94f2 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -45,9 +45,11 @@
+June 11th, 2002 [timothy]: Chapter 05 & 06 - All
+software: Updated the estimated required disk space.
+
June 11th, 2002 [timothy]: Chapter 05 & 06 - GCC:
-Updated the package contents and the estimated required disk
-space.
+Updated the package contents.
June 9th, 2002 [markh]: Chapter 06 - Creating
Directories: Changed usr,usr/local to just usr/local as we use the -p
diff --git a/chapter05/findutils.xml b/chapter05/findutils.xml
index 9f25462a0..dad29df27 100644
--- a/chapter05/findutils.xml
+++ b/chapter05/findutils.xml
@@ -2,8 +2,8 @@
Installing Findutils-&findutils-version;
-Estimated build time: &findutils-time;
-Estimated required disk space: &findutils-compsize;
+Estimated build time: &findutils-time-static;
+Estimated required disk space: &findutils-compsize-static;
&c5-findutils-inst;
&c5-findutils-exp;
diff --git a/chapter05/utillinux.xml b/chapter05/utillinux.xml
index a97f9b9c9..c9b291818 100644
--- a/chapter05/utillinux.xml
+++ b/chapter05/utillinux.xml
@@ -2,8 +2,8 @@
Installing Util-linux-&util-linux-version;
-Estimated build time: &util-linux-time;
-Estimated required disk space: &util-linux-compsize;
+Estimated build time: &util-linux-time-static;
+Estimated required disk space: &util-linux-compsize-static;
&c5-utillinux-inst;
&aa-utillinux-dep;
diff --git a/entities/autoconf.ent b/entities/autoconf.ent
index ee0f1dcab..c9366698c 100644
--- a/entities/autoconf.ent
+++ b/entities/autoconf.ent
@@ -15,5 +15,5 @@
-
+
diff --git a/entities/automake.ent b/entities/automake.ent
index 8e7a45c96..f0c591fc4 100644
--- a/entities/automake.ent
+++ b/entities/automake.ent
@@ -11,9 +11,9 @@
-
+
-
+
diff --git a/entities/bash.ent b/entities/bash.ent
index e46dbc665..79eae7fb6 100644
--- a/entities/bash.ent
+++ b/entities/bash.ent
@@ -19,8 +19,8 @@
-
+
-
+
diff --git a/entities/bin86.ent b/entities/bin86.ent
index 5e0fe5e18..afb9715bf 100644
--- a/entities/bin86.ent
+++ b/entities/bin86.ent
@@ -15,5 +15,5 @@
-
+
diff --git a/entities/binutils.ent b/entities/binutils.ent
index 662296462..0f50d929b 100644
--- a/entities/binutils.ent
+++ b/entities/binutils.ent
@@ -16,12 +16,12 @@
-
+
-
+
-
+
diff --git a/entities/bison.ent b/entities/bison.ent
index a02ef7c7b..2c3a35d7d 100644
--- a/entities/bison.ent
+++ b/entities/bison.ent
@@ -15,5 +15,5 @@
-
+
diff --git a/entities/bootscripts.ent b/entities/bootscripts.ent
index 3c2bedc20..add1b14d9 100644
--- a/entities/bootscripts.ent
+++ b/entities/bootscripts.ent
@@ -11,9 +11,9 @@
-
+
-
+
diff --git a/entities/bzip2.ent b/entities/bzip2.ent
index add650778..d1417fbe8 100644
--- a/entities/bzip2.ent
+++ b/entities/bzip2.ent
@@ -20,8 +20,8 @@
-
+
-
+
diff --git a/entities/diffutils.ent b/entities/diffutils.ent
index e1c0ecb72..c04284fe2 100644
--- a/entities/diffutils.ent
+++ b/entities/diffutils.ent
@@ -17,10 +17,10 @@
-
+
-
+
-
+
diff --git a/entities/e2fsprogs.ent b/entities/e2fsprogs.ent
index 6827191f6..ebb09139e 100644
--- a/entities/e2fsprogs.ent
+++ b/entities/e2fsprogs.ent
@@ -16,5 +16,5 @@
-
+
diff --git a/entities/ed.ent b/entities/ed.ent
index e10244241..97d52e679 100644
--- a/entities/ed.ent
+++ b/entities/ed.ent
@@ -18,5 +18,5 @@
-
+
diff --git a/entities/file.ent b/entities/file.ent
index d6fc6db94..1913e1640 100644
--- a/entities/file.ent
+++ b/entities/file.ent
@@ -15,5 +15,5 @@
-
+
diff --git a/entities/fileutils.ent b/entities/fileutils.ent
index 9ff6d1c7e..3b8ef7336 100644
--- a/entities/fileutils.ent
+++ b/entities/fileutils.ent
@@ -21,8 +21,8 @@
-
+
-
+
diff --git a/entities/findutils.ent b/entities/findutils.ent
index 4d4d78478..86955f245 100644
--- a/entities/findutils.ent
+++ b/entities/findutils.ent
@@ -22,5 +22,8 @@
+
+
+
diff --git a/entities/gawk.ent b/entities/gawk.ent
index 0296f2adf..ace21d062 100644
--- a/entities/gawk.ent
+++ b/entities/gawk.ent
@@ -21,8 +21,8 @@
-
+
-
+
diff --git a/entities/gettext.ent b/entities/gettext.ent
index 6e5082034..1c8d9b195 100644
--- a/entities/gettext.ent
+++ b/entities/gettext.ent
@@ -16,5 +16,5 @@
-
+
diff --git a/entities/grep.ent b/entities/grep.ent
index 0eda5b41d..cb0771056 100644
--- a/entities/grep.ent
+++ b/entities/grep.ent
@@ -19,8 +19,8 @@
-
+
-
+
diff --git a/entities/groff.ent b/entities/groff.ent
index 32e8bfcd3..6f552d8c1 100644
--- a/entities/groff.ent
+++ b/entities/groff.ent
@@ -16,5 +16,5 @@
-
+
diff --git a/entities/gzip.ent b/entities/gzip.ent
index d16863380..ff7cd4730 100644
--- a/entities/gzip.ent
+++ b/entities/gzip.ent
@@ -14,12 +14,12 @@
-
+
-
+
-
+
diff --git a/entities/kernel.ent b/entities/kernel.ent
index 92ab513c0..803ba04a0 100644
--- a/entities/kernel.ent
+++ b/entities/kernel.ent
@@ -19,7 +19,7 @@
-
+
diff --git a/entities/libtool.ent b/entities/libtool.ent
index facbdef8a..48907dd9e 100644
--- a/entities/libtool.ent
+++ b/entities/libtool.ent
@@ -15,5 +15,5 @@
-
+
diff --git a/entities/make.ent b/entities/make.ent
index d70319f6f..d05c0736a 100644
--- a/entities/make.ent
+++ b/entities/make.ent
@@ -19,7 +19,7 @@
-
+
diff --git a/entities/makedev.ent b/entities/makedev.ent
index da85e250a..ece3cee6d 100644
--- a/entities/makedev.ent
+++ b/entities/makedev.ent
@@ -12,8 +12,8 @@
-
+
-
+
diff --git a/entities/man.ent b/entities/man.ent
index 0e215f040..b35fcaefd 100644
--- a/entities/man.ent
+++ b/entities/man.ent
@@ -16,5 +16,5 @@
-
+
diff --git a/entities/manpages.ent b/entities/manpages.ent
index 79467e6d7..f583184d9 100644
--- a/entities/manpages.ent
+++ b/entities/manpages.ent
@@ -15,5 +15,5 @@
-
+
diff --git a/entities/ncurses.ent b/entities/ncurses.ent
index 53a65c4aa..b1ea94bda 100644
--- a/entities/ncurses.ent
+++ b/entities/ncurses.ent
@@ -19,5 +19,5 @@
-
+
diff --git a/entities/patch.ent b/entities/patch.ent
index 86293832b..4b9daf3d2 100644
--- a/entities/patch.ent
+++ b/entities/patch.ent
@@ -19,7 +19,7 @@
-
+
diff --git a/entities/perl.ent b/entities/perl.ent
index ac4ad82f3..44b5a9835 100644
--- a/entities/perl.ent
+++ b/entities/perl.ent
@@ -18,5 +18,5 @@
-
+
diff --git a/entities/procinfo.ent b/entities/procinfo.ent
index c1b1e8d0f..56280ce5c 100644
--- a/entities/procinfo.ent
+++ b/entities/procinfo.ent
@@ -16,5 +16,5 @@
-
+
diff --git a/entities/psmisc.ent b/entities/psmisc.ent
index 61338c4bc..b95a73cb2 100644
--- a/entities/psmisc.ent
+++ b/entities/psmisc.ent
@@ -16,5 +16,5 @@
-
+
diff --git a/entities/reiserfs.ent b/entities/reiserfs.ent
index 50125d78c..10c3b5760 100644
--- a/entities/reiserfs.ent
+++ b/entities/reiserfs.ent
@@ -16,5 +16,5 @@
-
+
diff --git a/entities/sed.ent b/entities/sed.ent
index 114212cf6..1d0562796 100644
--- a/entities/sed.ent
+++ b/entities/sed.ent
@@ -18,7 +18,7 @@
-
+
diff --git a/entities/shadow.ent b/entities/shadow.ent
index 1e55ac409..93f8bc30d 100644
--- a/entities/shadow.ent
+++ b/entities/shadow.ent
@@ -18,5 +18,5 @@
-
+
diff --git a/entities/shellutils.ent b/entities/shellutils.ent
index a09718c9b..77876dfab 100644
--- a/entities/shellutils.ent
+++ b/entities/shellutils.ent
@@ -18,8 +18,8 @@
-
+
-
+
diff --git a/entities/sysklogd.ent b/entities/sysklogd.ent
index 49f8a2a40..aa7c186b3 100644
--- a/entities/sysklogd.ent
+++ b/entities/sysklogd.ent
@@ -18,5 +18,5 @@
-
+
diff --git a/entities/sysvinit.ent b/entities/sysvinit.ent
index 7ab52bcd3..7f9d7c637 100644
--- a/entities/sysvinit.ent
+++ b/entities/sysvinit.ent
@@ -16,5 +16,5 @@
-
+
diff --git a/entities/tar.ent b/entities/tar.ent
index 0006f7cc0..4dc14afab 100644
--- a/entities/tar.ent
+++ b/entities/tar.ent
@@ -19,8 +19,8 @@
-
+
-
+
diff --git a/entities/texinfo.ent b/entities/texinfo.ent
index 34aed30df..6bdcd80bd 100644
--- a/entities/texinfo.ent
+++ b/entities/texinfo.ent
@@ -19,8 +19,8 @@
-
+
-
+
diff --git a/entities/textutils.ent b/entities/textutils.ent
index 8be9ff30c..c38495880 100644
--- a/entities/textutils.ent
+++ b/entities/textutils.ent
@@ -18,8 +18,8 @@
-
+
-
+
diff --git a/entities/utillinux.ent b/entities/utillinux.ent
index 2f0427767..6227501f9 100644
--- a/entities/utillinux.ent
+++ b/entities/utillinux.ent
@@ -15,9 +15,12 @@
-
+
-
+
+
+
+
diff --git a/entities/vim.ent b/entities/vim.ent
index e58e904f6..8b9b6f6dc 100644
--- a/entities/vim.ent
+++ b/entities/vim.ent
@@ -14,10 +14,10 @@
-
-
+
+
-
+