diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 9508a038f..f3c88ed4e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -100,6 +100,11 @@ $LFS/usr/bin/cpp.
 Chapter 5+6: Moved Glibc from chapter 5 to chapter 6.
 </para></listitem>
 
+<listitem><para>
+Chapter 5+6: Put back the instructions on how to copy/remove the old NSS library
+files, in case the original distribution uses glibc-2.0.x.
+</para></listitem>
+
 <listitem><para>
 Chapter 6: Changed libexecdir=/usr/bin in fileutils to libexecdir=/bin.
 </para></listitem>
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index 702298bd6..21dee4955 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -21,6 +21,7 @@
 &c5-texinfo;
 &c5-gettext;
 &c5-pwdgroup;
+&c5-oldnsslib;
 &c5-proc;
 
 </chapter>
diff --git a/chapter05/oldnsslib.xml b/chapter05/oldnsslib.xml
new file mode 100644
index 000000000..b56a97906
--- /dev/null
+++ b/chapter05/oldnsslib.xml
@@ -0,0 +1,31 @@
+<sect1 id="ch05-oldnsslib">
+<title>Copying old NSS library files</title>
+
+<para>
+If your normal Linux system runs glibc-2.0, you need to copy the NSS library
+files to the LFS partition. Certain statically linked programs still depend
+on the NSS library, especially programs that need to lookup usernames,userid's
+and groupid's. You can check which C library version your normal Linux system
+uses by simply executing the library, like this:
+</para>
+
+<blockquote><literallayout>
+
+	<userinput>/lib/libc.so.6</userinput>
+
+</literallayout></blockquote>
+
+<para>
+The first line will give you the release version. Following lines contain
+interesting information. If you have Glibc-2.0.x installed on your starting
+distribution, copy the NSS library files by running:
+</para>
+
+<blockquote><literallayout>
+
+	<userinput>cp -av /lib/libnss* $LFS/lib</userinput>
+
+</literallayout></blockquote>
+
+</sect1>
+
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 0ec5255ff..cf197bd06 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -54,7 +54,7 @@
 &c6-tar;
 &c6-textutils;
 &c6-utillinux;
-
+&c6-removeoldnss;
 &c6-configure;
 
 </chapter>
diff --git a/chapter06/removeoldnss.xml b/chapter06/removeoldnss.xml
new file mode 100644
index 000000000..71c689997
--- /dev/null
+++ b/chapter06/removeoldnss.xml
@@ -0,0 +1,17 @@
+<sect1 id="ch06-removeoldnss">
+<title>Removing old NSS library files</title>
+
+<para>
+If you have copied the NSS Library files from the normal Linux system to the
+LFS system (because the normal system runs glibc-2.0) it's time to remove
+them now by running:
+</para>
+
+<blockquote><literallayout>
+
+	<userinput>rm /lib/libnss*.so.1 /lib/libnss*2.0*</userinput>
+
+</literallayout></blockquote>
+
+</sect1>
+
diff --git a/index.xml b/index.xml
index 3bba8dcca..d4ced002b 100644
--- a/index.xml
+++ b/index.xml
@@ -4,8 +4,8 @@
 
 <!ENTITY book SYSTEM "intel/book/book.xml">
 
-<!ENTITY version "3.0-pre2">
-<!ENTITY releasedate "April 14th, 2001">
+<!ENTITY version "3.0-cvs-20010415">
+<!ENTITY releasedate "April 15th, 2001">
 <!ENTITY type "INTEL">
 
 <!ENTITY ftp-root "ftp://packages.linuxfromscratch.org">
@@ -179,6 +179,7 @@
 <!ENTITY c5-gettext SYSTEM "intel/chapter5/gettext-static.xml">
 <!ENTITY c5-gettext-inst SYSTEM "intel/chapter5/gettext-static-inst.xml">
 <!ENTITY c5-pwdgroup SYSTEM "intel/chapter5/pwdgroup.xml">
+<!ENTITY c5-oldnsslib SYSTEM "intel/chapter5/oldnsslib.xml">
 <!ENTITY c5-proc SYSTEM "intel/chapter5/proc.xml">
 
 <!ENTITY chapter6 SYSTEM "intel/chapter6/chapter6.xml">
@@ -293,6 +294,7 @@
 <!ENTITY c6-kbd-exp SYSTEM "intel/chapter6/kbd-exp.xml">
 <!ENTITY c6-manpages SYSTEM "intel/chapter6/manpages.xml">
 <!ENTITY c6-manpages-inst SYSTEM "intel/chapter6/manpages-inst.xml">
+<!ENTITY c6-removeoldnss SYSTEM "intel/chapter6/removeoldnss.xml">
 <!ENTITY c6-configure SYSTEM "intel/chapter6/configure.xml">
 <!ENTITY c6-cf-glibc SYSTEM "intel/chapter6/config-glibc.xml">
 <!ENTITY c6-cf-ldso SYSTEM "intel/chapter6/config-ldso.xml">