Index: boot/alpha/kernel.xml
===================================================================
--- boot/alpha/kernel.xml	(revision 608412f3b7d121c5f022450e7d179093b2b4e079)
+++ boot/alpha/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
@@ -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='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/common/util-linux.xml
===================================================================
--- boot/common/util-linux.xml	(revision 608412f3b7d121c5f022450e7d179093b2b4e079)
+++ boot/common/util-linux.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
@@ -38,4 +38,12 @@
     href="../../final-system/common/util-linux.xml"
     xpointer="xpointer(//*[@os='p4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/util-linux.xml"
+    xpointer="xpointer(//*[@os='p5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/util-linux.xml"
+    xpointer="xpointer(//*[@os='p6'])"/>
 
     <para os="ba">Util-linux does not use the freshly installed headers and
Index: boot/mips/kernel.xml
===================================================================
--- boot/mips/kernel.xml	(revision 608412f3b7d121c5f022450e7d179093b2b4e079)
+++ boot/mips/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
@@ -34,4 +34,12 @@
     href="../../bootable/mips/kernel.xml"
     xpointer="xpointer(//*[@os='bb'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/mips64/kernel.xml
===================================================================
--- boot/mips64/kernel.xml	(revision 608412f3b7d121c5f022450e7d179093b2b4e079)
+++ boot/mips64/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
@@ -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='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/mips64/util-linux.xml
===================================================================
--- boot/mips64/util-linux.xml	(revision 608412f3b7d121c5f022450e7d179093b2b4e079)
+++ boot/mips64/util-linux.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
@@ -40,10 +40,18 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips64/util-linux.xml"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='p5'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='p6'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips64/util-linux.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
+    xpointer="xpointer(//*[@os='p7'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/mips64/util-linux.xml"
+    xpointer="xpointer(//*[@os='p8'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/multilib/util-linux.xml
===================================================================
--- boot/multilib/util-linux.xml	(revision 608412f3b7d121c5f022450e7d179093b2b4e079)
+++ boot/multilib/util-linux.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
@@ -38,4 +38,12 @@
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='p4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='p5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='p6'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/ppc/kernel.xml
===================================================================
--- boot/ppc/kernel.xml	(revision 608412f3b7d121c5f022450e7d179093b2b4e079)
+++ boot/ppc/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
@@ -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='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/ppc64/kernel.xml
===================================================================
--- boot/ppc64/kernel.xml	(revision 608412f3b7d121c5f022450e7d179093b2b4e079)
+++ boot/ppc64/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
@@ -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='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/sparc/kernel.xml
===================================================================
--- boot/sparc/kernel.xml	(revision 608412f3b7d121c5f022450e7d179093b2b4e079)
+++ boot/sparc/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
@@ -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='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/sparc64/kernel.xml
===================================================================
--- boot/sparc64/kernel.xml	(revision 608412f3b7d121c5f022450e7d179093b2b4e079)
+++ boot/sparc64/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
@@ -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='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/x86/kernel.xml
===================================================================
--- boot/x86/kernel.xml	(revision 608412f3b7d121c5f022450e7d179093b2b4e079)
+++ boot/x86/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
@@ -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='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../bootable/x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/x86_64/kernel.xml
===================================================================
--- boot/x86_64/kernel.xml	(revision 608412f3b7d121c5f022450e7d179093b2b4e079)
+++ boot/x86_64/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
@@ -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='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: bootable/alpha/kernel.xml
===================================================================
--- bootable/alpha/kernel.xml	(revision 608412f3b7d121c5f022450e7d179093b2b4e079)
+++ bootable/alpha/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
@@ -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='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: bootable/mips/kernel.xml
===================================================================
--- bootable/mips/kernel.xml	(revision 608412f3b7d121c5f022450e7d179093b2b4e079)
+++ bootable/mips/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
@@ -30,4 +30,12 @@
 
 <screen os="bb"><userinput>patch -Np1 -i ../&linux-mips-patch;</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: bootable/ppc/kernel.xml
===================================================================
--- bootable/ppc/kernel.xml	(revision 608412f3b7d121c5f022450e7d179093b2b4e079)
+++ bootable/ppc/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
@@ -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='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: bootable/sparc/kernel.xml
===================================================================
--- bootable/sparc/kernel.xml	(revision 608412f3b7d121c5f022450e7d179093b2b4e079)
+++ bootable/sparc/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
@@ -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='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: bootable/x86/kernel.xml
===================================================================
--- bootable/x86/kernel.xml	(revision 608412f3b7d121c5f022450e7d179093b2b4e079)
+++ bootable/x86/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
@@ -31,4 +31,9 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
+
+    <para os="p1">Util-linux does not compute the checksum of a sun disklabel
+    properly with gcc-&gcc-version;. The following patch fixes this issue:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&linux-sun_disklabel_fix.patch;</userinput></screen>
 
     <para os="a">Building the kernel involves a few steps&mdash;configuration,
Index: bootable/x86_64/kernel.xml
===================================================================
--- bootable/x86_64/kernel.xml	(revision 608412f3b7d121c5f022450e7d179093b2b4e079)
+++ bootable/x86_64/kernel.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
@@ -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='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: final-system/common/util-linux.xml
===================================================================
--- final-system/common/util-linux.xml	(revision 608412f3b7d121c5f022450e7d179093b2b4e079)
+++ final-system/common/util-linux.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
@@ -60,4 +60,9 @@
 
 <screen os="p4"><userinput>patch -Np1 -i ../&util-linux-gcc4_fixes-patch;</userinput></screen>
+
+    <para os="p5">Util-linux does not compute the checksum of a sun disklabel
+    properly with gcc-&gcc-version;. The following patch fixes this issue:</para>
+
+<screen os="p6"><userinput>patch -Np1 -i ../&util-linux-gcc41_sun_disklabel_fixes.patch;</userinput></screen>
 
     <para os="a">Prepare Util-linux for compilation:</para>
Index: final-system/mips64/util-linux.xml
===================================================================
--- final-system/mips64/util-linux.xml	(revision 608412f3b7d121c5f022450e7d179093b2b4e079)
+++ final-system/mips64/util-linux.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
@@ -42,8 +42,16 @@
     xpointer="xpointer(//*[@os='p4'])"/>
 
-    <para os="p5">Util-linux has a compilation error when built using 64bit
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='p5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='p6'])"/>
+
+    <para os="p7">Util-linux has a compilation error when built using 64bit
     and a MIPS processor. The follow patch addresses this error:</para>
 
-<screen os="p6"><userinput>patch -Np1 -i ../&util-linux-mips64-patch;</userinput></screen>
+<screen os="p8"><userinput>patch -Np1 -i ../&util-linux-mips64-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: final-system/multilib/util-linux.xml
===================================================================
--- final-system/multilib/util-linux.xml	(revision 608412f3b7d121c5f022450e7d179093b2b4e079)
+++ final-system/multilib/util-linux.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
@@ -44,4 +44,12 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='p5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='p6'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
Index: introduction/common/changelog.xml
===================================================================
--- introduction/common/changelog.xml	(revision 608412f3b7d121c5f022450e7d179093b2b4e079)
+++ introduction/common/changelog.xml	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
@@ -38,4 +38,13 @@
 
     <listitem>
+      <para>April 14, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Added a util-linux and kernel patch to fix a checksum calculation issue for sun disklabels.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 13, 2006</para>
       <itemizedlist>
Index: patches.ent
===================================================================
--- patches.ent	(revision 608412f3b7d121c5f022450e7d179093b2b4e079)
+++ patches.ent	(revision 04ef3790e4a61dcb9efbe0a2396f3dd5f818535a)
@@ -32,4 +32,6 @@
 <!ENTITY kbd-gcc4_fixes-patch "kbd-&kbd-version;-gcc4_fixes-1.patch">
 
+<!ENTITY linux-sun_disklabel_fix.patch "linux-&linux-version;-sun_disklabel_fix-1.patch">
+
 <!ENTITY mktemp-tempfile-patch "mktemp-&mktemp-version;-add_tempfile-3.patch">
 
@@ -49,4 +51,5 @@
 <!ENTITY util-linux-cramfs-patch "util-linux-&util-linux-version;-cramfs-1.patch">
 <!ENTITY util-linux-gcc4_fixes-patch "util-linux-&util-linux-version;-gcc4_fixes-1.patch">
+<!ENTITY util-linux-gcc41_sun_disklabel_fixes.patch "util-linux-&util-linux-version;-sun_disklabel_fixes-1.patch">
 
 <!ENTITY vim-security_fix-patch "vim-&vim-version;-security_fix-2.patch">
