diff --git a/Attic/appendixc/glibc-patch.xml b/Attic/appendixc/glibc-patch.xml
new file mode 100644
index 000000000..089cf82b4
--- /dev/null
+++ b/Attic/appendixc/glibc-patch.xml
@@ -0,0 +1,3 @@
+Glibc-patch (&glibc-version;):
+<ulink url="ftp://ftp.gnu.org/gnu/glibc/">ftp://ftp.gnu.org/gnu/glibc/</ulink>
+
diff --git a/Attic/appendixc/packages.xml b/Attic/appendixc/packages.xml
index 66554d64b..dbd84c874 100644
--- a/Attic/appendixc/packages.xml
+++ b/Attic/appendixc/packages.xml
@@ -27,6 +27,7 @@ package quicker.</para>
 &ac-texinfo;
 &ac-textutils;
 &ac-glibc;
+&ac-glibc-patch;
 &ac-glibc-threads;
 &ac-makedev;
 &ac-manpages;
diff --git a/chapter04/glibc-patch.xml b/chapter04/glibc-patch.xml
new file mode 100644
index 000000000..4c9b525bd
--- /dev/null
+++ b/chapter04/glibc-patch.xml
@@ -0,0 +1,6 @@
+Glibc-patch (&glibc-version;) - &glibc-patch-size;:
+<ulink
+url="&ftp;/glibc-&glibc-version;-nss.diff.bz2">&ftp;/glibc-&glibc-version;-nss.diff.bz2</ulink>
+<ulink 
+url="&http;/glibc-&glibc-version;-nss.diff.bz2">&http;/glibc-&glibc-version;.-nss.diff.bz2</ulink>
+
diff --git a/chapter04/packages.xml b/chapter04/packages.xml
index 60cd2620a..64fd0b65b 100644
--- a/chapter04/packages.xml
+++ b/chapter04/packages.xml
@@ -27,6 +27,7 @@
 &c3-patch;
 &c3-makedev;
 &c3-glibc;
+&c3-glibc-patch;
 &c3-glibc-threads;
 &c3-manpages;
 &c3-manpages-patch;
diff --git a/chapter06/glibc-exp.xml b/chapter06/glibc-exp.xml
index 11c8d6b47..73aa27bad 100644
--- a/chapter06/glibc-exp.xml
+++ b/chapter06/glibc-exp.xml
@@ -1,6 +1,10 @@
 <sect2>
 <title>Command explanations</title>
 
+<para><userinput>patch -Np0 -i ../glibc-2.2.3-nss.diff</userinput>: This
+patch is needed to fix a couple of nasty nis bugs in glibc which can
+cause problems.</para>
+
 <para><userinput>mknod -m 0666 /dev/null c 1 3:</userinput> Glibc needs a
 null device to compile properly. All other devices will be created in the
 next section.</para>
diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml
index 2d064122b..b39be8a8b 100644
--- a/chapter06/glibc-inst.xml
+++ b/chapter06/glibc-inst.xml
@@ -1,14 +1,17 @@
 <sect2>
 <title>Installation of Glibc</title>
 
-<para>Once glibc has been unpacked as usual and you have cd'ed into the
+<para>Before starting to install glibc, unpack the glibc-2.2.3-nss.diff
+file in the $LFS/usr/src tree.  Then, once glibc has been unpacked as usual 
+and you have cd'ed into the
 glibc-&glibc-version; directory, unpack glibc-linuxthreads inside
 the glibc-&glibc-version; directory, not in /usr/src as you normally
 would do.</para>
 
 <para>Install Glibc by running the following commands:</para>
 
-<para><screen><userinput>mknod -m 0666 /dev/null c 1 3 &amp;&amp;</userinput>
+<para><screen><userinput>patch -Np0 -i ../glibc-2.2.3-nss.diff &amp;&amp;</userinput>
+<userinput>mknod -m 0666 /dev/null c 1 3 &amp;&amp;</userinput>
 <userinput>touch /etc/ld.so.conf &amp;&amp;</userinput>
 <userinput>mkdir ../glibc-build &amp;&amp;</userinput>
 <userinput>cd ../glibc-build &amp;&amp;</userinput>
diff --git a/index.xml b/index.xml
index 38c22b29e..9f75fa37e 100644
--- a/index.xml
+++ b/index.xml
@@ -90,6 +90,7 @@
 <!ENTITY c3-gettext SYSTEM "chapter3/gettext.xml">
 <!ENTITY c3-makedev SYSTEM "chapter3/makedev.xml">
 <!ENTITY c3-glibc SYSTEM "chapter3/glibc.xml">
+<!ENTITY c3-glibc-patch SYSTEM "chapter3/glibc-patch.xml">
 <!ENTITY c3-glibc-threads SYSTEM "chapter3/glibc-threads.xml">
 <!ENTITY c3-manpages SYSTEM "chapter3/manpages.xml">
 <!ENTITY c3-manpages-patch SYSTEM "chapter3/manpages-patch.xml">
@@ -476,6 +477,7 @@
 <!ENTITY ac-gettext SYSTEM "appendixc/gettext.xml">
 <!ENTITY ac-makedev SYSTEM "appendixc/makedev.xml">
 <!ENTITY ac-glibc SYSTEM "appendixc/glibc.xml">
+<!ENTITY ac-glibc-patch SYSTEM "appendixc/glibc-patch.xml">
 <!ENTITY ac-glibc-threads SYSTEM "appendixc/glibc-threads.xml">
 <!ENTITY ac-manpages SYSTEM "appendixc/manpages.xml">
 <!ENTITY ac-manpages-patch SYSTEM "appendixc/manpages-patch.xml">
@@ -512,7 +514,7 @@
 <!ENTITY ac-netkitbase SYSTEM "appendixc/netkitbase.xml">
 <!ENTITY ac-nettools SYSTEM "appendixc/nettools.xml">
 
-<!ENTITY all-version "cvs-20010808-0320">
+<!ENTITY all-version "cvs-20010808-1130">
 <!ENTITY all-size-kb "77,160 KB">
 <!ENTITY all-size-mb "75 MB">
 
@@ -649,6 +651,7 @@
 
 <!ENTITY glibc-version "2.2.3">
 <!ENTITY glibc-size "11,091 KB">
+<!ENTITY glibc-patch-size "1 KB">
 <!ENTITY glibc-threads-size "158.93 KB">
 <!ENTITY glibc-compsize "glibc MB">
 <!ENTITY glibc-time "glibc minutes">