diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index e967e0592..7fc14b0cd 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -49,6 +49,13 @@
+January 1st, 2002 [gerard]: Chapter 06 - Glibc Second Pass:
+Fixec typo in linuxthreads man pages installation.
+
+January 1st, 2002 [gerard]: Chapter 06 - Linux Kernel: The
+man pages can't be installed here because it requires Perl. Moved to end of
+chapter 6.
+
December 31st, 2002 [gerard]: Chapter 06 - Man: Updated the
patch so man pages are formatted properly on screens with more than 80
columns.
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 3cf4f1573..36d223499 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -62,6 +62,7 @@
&c6-sysvinit;
&c6-tar;
&c6-utillinux;
+&c6-kernel-manpages;
&c6-glibc-pass2;
&c6-bootscripts;
&c6-configure;
diff --git a/chapter06/glibc-pass2-inst.xml b/chapter06/glibc-pass2-inst.xml
index 5e5637b30..876430117 100644
--- a/chapter06/glibc-pass2-inst.xml
+++ b/chapter06/glibc-pass2-inst.xml
@@ -45,7 +45,7 @@ cd ../glibc-build &&
make &&
make install &&
make -C ../glibc-&glibc-version;/linuxthreads/man &&
-make -C ../glibc-&glibc-version;/linuxthread/man install &&
+make -C ../glibc-&glibc-version;/linuxthreads/man install &&
exec /bin/bash --login
diff --git a/chapter06/glibc-pass2.xml b/chapter06/glibc-pass2.xml
index 2afc9d930..e9826c957 100644
--- a/chapter06/glibc-pass2.xml
+++ b/chapter06/glibc-pass2.xml
@@ -2,8 +2,8 @@
Installing Glibc-&glibc-version;
-Estimated build time: &glibc-time;
-Estimated required disk space: &glibc-compsize;
+Estimated build time: &glibc-pass2-time;
+Estimated required disk space: &glibc-pass2-compsize;
&c6-glibc-pass2-inst;
diff --git a/chapter06/kernel-inst.xml b/chapter06/kernel-inst.xml
index 2324ad707..ff09e3aa7 100644
--- a/chapter06/kernel-inst.xml
+++ b/chapter06/kernel-inst.xml
@@ -1,5 +1,5 @@
-Installation of the kernel headers and man pages
+Installation of the kernel headers
We won't be compiling a new kernel yet -- we'll do that when we have
finished the installation of all the packages. But as some packages need the
@@ -20,19 +20,17 @@ access to the kernel source.
0.0 on the linux-&kernel-version; directory to ensure all files
are owned by user root.
-The kernel headers and man pages are installed by running the following
+The kernel headers are installed by running the following
commands:
ln -s /static/bin/pwd /bin/pwd &&
make mrproper &&
make include/linux/version.h &&
make symlinks &&
-make mandocs &&
cp -HR include/asm /usr/include &&
cp -R include/asm-generic /usr/include &&
cp -R include/linux /usr/include &&
touch /usr/include/linux/autoconf.h &&
-cp -a Documentation/man /usr/share/man/man9 &&
rm /bin/pwd
diff --git a/chapter06/kernel-manpages-inst.xml b/chapter06/kernel-manpages-inst.xml
new file mode 100644
index 000000000..91fbbd5bc
--- /dev/null
+++ b/chapter06/kernel-manpages-inst.xml
@@ -0,0 +1,11 @@
+
+Installation of the kernel man pages
+
+The kernel man pages are installed by running the following
+commands:
+
+make mandocs &&
+cp -a Documentation/man /usr/share/man/man9
+
+
+
diff --git a/chapter06/kernel-manpages.xml b/chapter06/kernel-manpages.xml
new file mode 100644
index 000000000..f6f4b6ea0
--- /dev/null
+++ b/chapter06/kernel-manpages.xml
@@ -0,0 +1,11 @@
+
+Installing Linux-&kernel-version; man pages
+
+
+Estimated build time: &kernel-manpages-time;
+Estimated required disk space: &kernel-manpages-compsize;
+
+&c6-kernel-manpages-inst;
+
+
+
diff --git a/chapter06/kernel.xml b/chapter06/kernel.xml
index 3be877efb..74fb6bba0 100644
--- a/chapter06/kernel.xml
+++ b/chapter06/kernel.xml
@@ -1,5 +1,5 @@
-Installing Linux-&kernel-version;
+Installing Linux-&kernel-version; headers
Estimated build time: &kernel-time-headers;
diff --git a/entities/glibc.ent b/entities/glibc.ent
index bb068bbca..37e9d7d15 100644
--- a/entities/glibc.ent
+++ b/entities/glibc.ent
@@ -27,4 +27,6 @@
+
+
diff --git a/entities/kernel.ent b/entities/kernel.ent
index 00a2a1719..779496e8b 100644
--- a/entities/kernel.ent
+++ b/entities/kernel.ent
@@ -4,6 +4,8 @@
+
+
@@ -20,7 +22,10 @@
-
+
+
+
+