diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 9a2b3ca21..89c6e680d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -89,6 +89,11 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>August 27, 2004 [jeremy]: (Experimental) Changed both chapter
+5 and chapter 6 glibc to compile against sanitized headers instead of raw
+kernel headers - this brings us more in line with what is considered "proper",
+and should have minimal affect on the build itself.</para></listitem>
+
 <listitem><para>August 27, 2004 [jeremy]: (Experimental) Added -B/usr/bin flag
 to GCC Pass 1 to solve possible problem where the host's toolchain is
 actually newer than the one we're building.  Change taken from Greg Schafer's
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index bf810d2fb..dbeb3bf40 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -14,7 +14,9 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="binutils-pass1.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gcc-pass1.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="linux-libc-headers.xml"/>
+<!--
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kernel-headers.xml"/>
+-->
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="glibc.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="adjusting.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tcl.xml"/>
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index de1458c2a..bcb7b34dc 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -47,7 +47,7 @@ cd ../glibc-build</userinput></screen>
 <screen><userinput>../glibc-&glibc-version;/configure --prefix=/tools \
     --disable-profile --enable-add-ons=nptl --with-tls \
     --with-__thread --enable-kernel=2.6.0 --with-binutils=/tools/bin \
-    --without-gd --without-cvs --with-headers=/tools/glibc-kernheaders</userinput></screen>
+    --without-gd --without-cvs</userinput></screen>
 
 <para>The meaning of the configure options:</para>
 
@@ -106,13 +106,6 @@ snapshot. But it's not actually needed these days. We use it because it
 suppresses an annoying but harmless warning about a missing
 <command>autoconf</command> program.</para></listitem>
 </varlistentry>
-
-<varlistentry>
-<term><parameter>--with-headers=/tools/glibc-kernheaders</parameter></term>
-<listitem><para>This tells Glibc to compile against the <quote>raw</quote> 
-kernel headers, so that it knows exactly what features the kernel has, and can 
-optimize itself accordingly.  Not strictly necessary, but nice to have.</para></listitem>
-</varlistentry>
 </variablelist>
 
 <para>During this stage you might see the following warning:</para>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 3367e1d5d..0bdc4c9f4 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -51,8 +51,7 @@ cd ../glibc-build</userinput></screen>
 <screen><userinput>../glibc-&glibc-version;/configure --prefix=/usr \
     --disable-profile --enable-add-ons=nptl --with-tls \
     --with-__thread --enable-kernel=2.6.0 --without-cvs \
-    --libexecdir=/usr/lib/glibc \
-    --with-headers=/tools/glibc-kernheaders</userinput></screen>
+    --libexecdir=/usr/lib/glibc</userinput></screen>
 
 <para>The meaning of the new configure options:</para>