diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index fedcc50e2..c7d6571f8 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -45,6 +45,14 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>June 12th, 2002 [timothy]: Chapter 05 - GCC:
+Modified the build instructions and command explanations to
+only build the C compiler. The C++ compiler is not needed
+until after the second GCC build.</para></listitem>
+
+<listitem><para>June 12th, 2002 [timothy]: Chapter 06 - Shadow:
+Made some grammatic changes.</para></listitem>
+
 <listitem><para>June 12th, 2002 [timothy]: Chapter 04 - Mounting the 
 new partition: Joined two commands which create the /mnt/lfs and 
 /mnt/lfs/usr directories.</para></listitem>
diff --git a/chapter05/gcc-exp.xml b/chapter05/gcc-exp.xml
index d6c50e954..b298990df 100644
--- a/chapter05/gcc-exp.xml
+++ b/chapter05/gcc-exp.xml
@@ -10,10 +10,10 @@ codes some paths while compiling and so we need to pass /static as the
 prefix during ./configure.  We pass the real install prefix during the
 make install command later.</para>
 
-<para><userinput>--enable-languages=c,c++:</userinput> This only builds the C
-and C++ compilers and not the other available compilers as they are, on
-the average, not often used. If those other compilers are needed,
-the --enable-languages parameter can be omitted.</para>
+<para><userinput>--enable-languages=c:</userinput> This builds the C
+compiler. The C++ compiler will be built in chapter 6, when we rebuild
+GCC. Other compilers are available as well. If they are needed,
+the --enable-languages parameter may be omitted.</para>
 
 <para><userinput>--enable-threads=posix:</userinput> This enables C++ 
 exception handling for multithreaded code.</para>
diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml
index ad1e168ba..13f283098 100644
--- a/chapter05/gcc-inst.xml
+++ b/chapter05/gcc-inst.xml
@@ -12,7 +12,7 @@ been warned.</para>
 
 <para><screen><userinput>mkdir ../gcc-build &amp;&amp;
 cd ../gcc-build &amp;&amp;
-../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c,c++ \
+../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c \
 &nbsp;&nbsp;&nbsp;--disable-nls --disable-shared --enable-threads=posix &amp;&amp;
 make BOOT_LDFLAGS=-static bootstrap &amp;&amp;
 make prefix=$LFS/static install &amp;&amp;
diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml
index b530321b8..0f02f23cc 100644
--- a/chapter06/shadowpwd-inst.xml
+++ b/chapter06/shadowpwd-inst.xml
@@ -1,11 +1,11 @@
 <sect2>
 <title>Installation of Shadow Password Suite</title>
 
-<para>Before you install this package, you may want to have a look at 
-the <ulink url="&hints-root;shadowpasswd_plus.txt"/> lfs hint. It 
-discusses how you can make your system more secure regarding
-passwords, such as how to enable the more secure MD5 passwords, and how to
-get the most out of this Shadow package.</para>
+<para>Before you install this package, you may want to have a look at
+the Shadow hint. It discusses how you can make your system more secure
+regarding passwords, such as how to enable the more secure MD5 passwords,
+and how to get the most out of this Shadow package. The Shadow hint can
+be found at <ulink url="&hints-root;shadowpasswd_plus.txt"/>.</para>
 
 <para>Install the Shadow Password Suite by running the 
 following commands:</para>