Index: BOOK/boot/alpha/kernel.xml
===================================================================
--- BOOK/boot/alpha/kernel.xml	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/boot/alpha/kernel.xml	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -26,4 +26,12 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/mips/kernel.xml
===================================================================
--- BOOK/boot/mips/kernel.xml	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/boot/mips/kernel.xml	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -26,4 +26,12 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/mips64/kernel.xml
===================================================================
--- BOOK/boot/mips64/kernel.xml	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/boot/mips64/kernel.xml	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -26,4 +26,12 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/ppc/kernel.xml
===================================================================
--- BOOK/boot/ppc/kernel.xml	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/boot/ppc/kernel.xml	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -26,4 +26,12 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/ppc64/kernel.xml
===================================================================
--- BOOK/boot/ppc64/kernel.xml	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/boot/ppc64/kernel.xml	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -26,4 +26,12 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/sparc/kernel.xml
===================================================================
--- BOOK/boot/sparc/kernel.xml	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/boot/sparc/kernel.xml	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -26,4 +26,12 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/sparc64/kernel.xml
===================================================================
--- BOOK/boot/sparc64/kernel.xml	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/boot/sparc64/kernel.xml	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -26,4 +26,12 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/x86/kernel.xml
===================================================================
--- BOOK/boot/x86/kernel.xml	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/boot/x86/kernel.xml	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -32,4 +32,12 @@
       use the resulting kernel image for production systems.</para>
     </warning>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../bootable/x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../bootable/x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/x86_64/kernel.xml
===================================================================
--- BOOK/boot/x86_64/kernel.xml	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/boot/x86_64/kernel.xml	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -26,4 +26,12 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/alpha/kernel.xml
===================================================================
--- BOOK/bootable/alpha/kernel.xml	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/bootable/alpha/kernel.xml	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -21,4 +21,12 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/mips/kernel.xml
===================================================================
--- BOOK/bootable/mips/kernel.xml	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/bootable/mips/kernel.xml	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -21,4 +21,12 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/mips64/kernel.xml
===================================================================
--- BOOK/bootable/mips64/kernel.xml	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/bootable/mips64/kernel.xml	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -21,4 +21,12 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/ppc/kernel.xml
===================================================================
--- BOOK/bootable/ppc/kernel.xml	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/bootable/ppc/kernel.xml	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -21,4 +21,12 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/ppc64/kernel.xml
===================================================================
--- BOOK/bootable/ppc64/kernel.xml	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/bootable/ppc64/kernel.xml	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -21,4 +21,12 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/sparc/kernel.xml
===================================================================
--- BOOK/bootable/sparc/kernel.xml	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/bootable/sparc/kernel.xml	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -21,4 +21,12 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/sparc64-64/kernel.xml
===================================================================
--- BOOK/bootable/sparc64-64/kernel.xml	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/bootable/sparc64-64/kernel.xml	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -21,4 +21,12 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/sparc64/kernel.xml
===================================================================
--- BOOK/bootable/sparc64/kernel.xml	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/bootable/sparc64/kernel.xml	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -21,4 +21,12 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/x86/kernel.xml
===================================================================
--- BOOK/bootable/x86/kernel.xml	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/bootable/x86/kernel.xml	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -22,4 +22,10 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
+
+    <para os="a1">A number of vulnerabilities have come to light after the
+    stable kernel team stopped supporting 2.6.24.  The following patch addresses
+    them:</para>
+
+<screen os="a2"><userinput>patch -Np1 -i ../&linux-security-patch;</userinput></screen>
 
     <para os="a">Building the kernel involves a few steps&mdash;configuration,
Index: BOOK/bootable/x86_64-64/kernel.xml
===================================================================
--- BOOK/bootable/x86_64-64/kernel.xml	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/bootable/x86_64-64/kernel.xml	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -21,4 +21,12 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/x86_64/kernel.xml
===================================================================
--- BOOK/bootable/x86_64/kernel.xml	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/bootable/x86_64/kernel.xml	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -21,4 +21,12 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='a2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/general.ent
===================================================================
--- BOOK/general.ent	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/general.ent	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -3,5 +3,5 @@
 <!ENTITY month "06"> <!-- Use two digits -->
 <!ENTITY month_name "June">
-<!ENTITY day "06"> <!-- Use two digits -->
+<!ENTITY day "17"> <!-- Use two digits -->
 <!ENTITY year "2008"> <!-- Use four digits -->
 
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/introduction/common/changelog.xml	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -38,5 +38,15 @@
 
     <listitem>
-      <para>July 7, 2008</para>
+      <para>June 17, 2008</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Ken] - Fix all known kernel vulnerabilities by upgrading to 2.6.24.7
+	  plus a patch extracted from debian for the more recent fixes.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>June 7, 2008</para>
       <itemizedlist>
         <listitem>
Index: BOOK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/materials/common/patches.xml	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -146,4 +146,13 @@
 
     <varlistentry>
+      <term>Linux Security Fixes Patch - <token>&linux-security-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&linux-security-patch;"/></para>
+        <para>MD5 sum: <literal>&linux-security-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Mktemp Tempfile Patch - <token>&mktemp-tempfile-patch-size;</token>:</term>
       <listitem>
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/packages.ent	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -244,8 +244,8 @@
 <!ENTITY linux-dl-version "2.6">
 
-<!ENTITY linux-version "2.6.24">
-<!ENTITY linux-size "45,696 KB">
+<!ENTITY linux-version "2.6.24.7">
+<!ENTITY linux-size "45,638 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2">
-<!ENTITY linux-md5 "3f23ad4b69d0a552042d1ed0f4399857">
+<!ENTITY linux-md5 "40a73780d51525d28d36dec852c680c4">
 <!ENTITY linux-home "http://www.kernel.org">
 
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision c01b0f3340961ae46084451a7e4e597aaed259a1)
+++ BOOK/patches.ent	(revision 4a7ae169dceb84737d5c790032003978c86ba157)
@@ -61,4 +61,8 @@
 <!ENTITY glibc-localedef_segfault-patch-size "4 KB">
 
+<!ENTITY linux-security-patch "linux-&linux-version;-security_fixes-1.patch">
+<!ENTITY linux-security-patch-md5 "7f244856cc40e478f5f66a6a6267d4c6">
+<!ENTITY linux-security-patch-size "15.5 KB">
+
 <!ENTITY mktemp-tempfile-patch "mktemp-&mktemp-version;-add_tempfile-3.patch">
 <!ENTITY mktemp-tempfile-patch-md5 "65d73faabe3f637ad79853b460d30a19">
