Index: BOOK/boot/x86/grub-build.xml
===================================================================
--- BOOK/boot/x86/grub-build.xml	(revision 94053a6f08ebaacb29dac1b0f14e5e87c1eee127)
+++ BOOK/boot/x86/grub-build.xml	(revision 37ba094c75aa7f23b23012c8a1fcb9b62d9f247a)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GRUB</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/grub.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/grub.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/x86/grub.xml
===================================================================
--- BOOK/final-system/x86/grub.xml	(revision 94053a6f08ebaacb29dac1b0f14e5e87c1eee127)
+++ BOOK/final-system/x86/grub.xml	(revision 37ba094c75aa7f23b23012c8a1fcb9b62d9f247a)
@@ -23,4 +23,10 @@
   <sect2 role="installation">
     <title>Installation of GRUB</title>
+
+   <para os="p1">Sometimes grub under Linux 2.6 doesn't detect the disk geometry correctly,
+   which will result in an error message. The error message is
+   Error 24: Attempt to access block outside partition. The following patch fixes this issue:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&grub-disk-patch;</userinput></screen>
 
     <para os="a">This package is known to have issues when its default optimization
Index: BOOK/general.ent
===================================================================
--- BOOK/general.ent	(revision 94053a6f08ebaacb29dac1b0f14e5e87c1eee127)
+++ BOOK/general.ent	(revision 37ba094c75aa7f23b23012c8a1fcb9b62d9f247a)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY version "SVN-20060525">
+<!ENTITY version "SVN-20060528">
 <!ENTITY version-x86 "&version;-x86">
 <!ENTITY version-x86_64 "&version;-x86_64-Multilib">
@@ -16,5 +16,5 @@
 <!ENTITY version-alpha "&version;-ALPHA">
 
-<!ENTITY releasedate "May 25, 2006">
+<!ENTITY releasedate "May 28, 2006">
 <!ENTITY milestone "0.1">
 <!ENTITY generic-version "svn"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 94053a6f08ebaacb29dac1b0f14e5e87c1eee127)
+++ BOOK/introduction/common/changelog.xml	(revision 37ba094c75aa7f23b23012c8a1fcb9b62d9f247a)
@@ -38,4 +38,14 @@
 
     <listitem>
+      <para>May 28, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Added a patch to Grub to prevent.
+	   Error 24: Attempt to access block outside partition.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 25, 2006</para>
       <itemizedlist>
Index: BOOK/materials/x86/patches.xml
===================================================================
--- BOOK/materials/x86/patches.xml	(revision 94053a6f08ebaacb29dac1b0f14e5e87c1eee127)
+++ BOOK/materials/x86/patches.xml	(revision 37ba094c75aa7f23b23012c8a1fcb9b62d9f247a)
@@ -31,4 +31,13 @@
     </varlistentry>
 
+    <varlistentry os="grub-disk-patch">
+      <term>Grub Disk Geometry Fix - <token>&grub-disk-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;grub/&grub-disk-patch;"/></para>
+        <para>MD5 sum: <literal>&grub-disk-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
   </variablelist>
 
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision 94053a6f08ebaacb29dac1b0f14e5e87c1eee127)
+++ BOOK/patches.ent	(revision 37ba094c75aa7f23b23012c8a1fcb9b62d9f247a)
@@ -247,4 +247,8 @@
 <!ENTITY coreutils-x86_uname-patch-size "4.5 KB">
 
+<!ENTITY grub-disk-patch "grub-&grub-version;-disk_geometry-1.patch">
+<!ENTITY grub-disk-patch-md5 "2d29c8ad60d548f2abfaec79ea8bc268">
+<!ENTITY grub-disk-patch-size "28 KB">
+
 <!ENTITY lilo-cross-x86_64-patch "lilo-&lilo-version;-cross_compile_x86_64-1.patch">
 <!ENTITY lilo-cross-x86_64-patch-md5 "00487cebd84e9958dddb3adf357babeb">
