diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index bacf023e1..e3d25ae1f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
 
 -->
 
+    <listitem>
+      <para>2009-05-28</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update grub make instruction to ensure all
+          checks pass.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2009-05-27</para>
       <itemizedlist>
diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index 66a368a1c..f8c4efcad 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -73,9 +73,10 @@
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para>Compile the package, but use custom optimization flags to
+    prevent an error flagged in the test routines:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
+<screen><userinput remap="make">make CFLAGS="-march=i486 -mtune=native -Os"</userinput></screen>
 
     <para>To test the results, issue:</para>
 
diff --git a/general.ent b/general.ent
index 4e7fd0925..7ad2d59dc 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20090527">
-<!ENTITY releasedate "May 27, 2009">
+<!ENTITY version "SVN-20090528">
+<!ENTITY releasedate "May 28, 2009">
 <!ENTITY copyrightdate "1999-2009"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "6.5">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->