diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c60ebcf55..fd229e50d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,13 +39,18 @@
     <listitem>
       <para>2007-06-05</para>
       <itemizedlist>
-	<listitem>
+        <listitem>
+          <para>[manuel] - Made more prominent that the headers in the system's
+          include directory must be ones against which Glibc was compiled.
+          Fixes  <ulink url="&lfs-ticket-root;2024">#2024</ulink></para>
+        </listitem>
+        <listitem>
           <para>[alexander] - Upgrade to Linux-2.6.21.3, Man-Pages-2.51 and
           TCL-8.4.15.
           Fixes <ulink url="&lfs-ticket-root;2020">#2020</ulink>,
           <ulink url="&lfs-ticket-root;2021">#2021</ulink> and
           <ulink url="&lfs-ticket-root;2022">#2022</ulink>.</para>
-	</listitem>
+        </listitem>
       </itemizedlist>
     </listitem>
 
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index cd6670db9..03ca3bd1b 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -137,13 +137,15 @@ cp -r Documentation/* /usr/share/doc/linux-&linux-version;</userinput></screen>
       <emphasis>must not</emphasis> be created on an LFS system as it can cause
       problems for packages you may wish to build once your base LFS system is
       complete.</para>
+    </warning>
 
-      <para>Also, the headers in the system's
+    <warning>
+      <para>The headers in the system's
       <filename class="directory">include</filename> directory should
       <emphasis>always</emphasis> be the ones against which Glibc was compiled,
-      that is, the sanitised headers from the Linux kernel tarball, and
-      therefore, should <emphasis>never</emphasis> be replaced by the raw kernel
-      headers.</para>
+      that is, the sanitised headers from the Linux kernel tarball.
+      Therefore, should <emphasis>never</emphasis> be replaced by the raw kernel
+      headers or if upgrading the kernel.</para>
     </warning>
 
   </sect2>