diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 9d14150ab..7e3d90f5b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
     <listitem>
       <para>2009-02-17</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgraded to Grep-2.5.4.  Fixes
+          <ulink url="&lfs-ticket-root;2346">#2346</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgraded to Man-Pages-3.18.  Fixes
           <ulink url="&lfs-ticket-root;2347">#2347</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index f52121ba7..00935f2e3 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -83,9 +83,9 @@
     <!-- <listitem>
       <para>GMP &gmp-version;</para>
     </listitem> -->
-    <!--<listitem>
+    <listitem>
       <para>Grep &grep-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Groff &groff-version;</para>
     </listitem>
@@ -216,6 +216,10 @@
       <para>&gcc-startfiles-patch;</para>
     </listitem>
 
+    <listitem>
+      <para>&grep-debian-patch;</para>
+    </listitem>
+
     <listitem>
       <para>&inetutils-man_pages-patch;</para>
     </listitem>
@@ -265,6 +269,12 @@
     <listitem>
       <para>binutils-2.18-configure-1.patch</para>
     </listitem>
+    <listitem>
+      <para>grep-2.5.3-debian_fixes-1.patch</para>
+    </listitem>
+    <listitem>
+      <para>grep-2.5.3-upstream_fixes-1.patch</para>
+    </listitem>
     <listitem>
       <para>groff-1.18.1.4-debian_fixes-1.patch</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 50e173a98..9cfd06c17 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -114,14 +114,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Grep Upstream Fixes Patch - <token>&grep-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&grep-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&grep-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>GRUB Disk Geometry Patch - <token>&grub-geometry-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/grep.xml b/chapter06/grep.xml
index 4e9127b02..d50c37274 100644
--- a/chapter06/grep.xml
+++ b/chapter06/grep.xml
@@ -47,12 +47,6 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../&grep-debian-patch;</userinput></screen>
 
-    <para>Upstream have fixed some of the documentation, and changed some of the
-    tests and the expected results in the newest test scripts.  This means that
-    not so many of the individual tests fail:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&grep-fixes-patch;</userinput></screen>
-
     <para>Prepare Grep for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr \
diff --git a/packages.ent b/packages.ent
index 916f81290..7e0b79c48 100644
--- a/packages.ent
+++ b/packages.ent
@@ -217,10 +217,10 @@
 <!ENTITY gmp-ch6-du "39.4 MB testsuite included">
 <!ENTITY gmp-ch6-sbu "1.5 SBU testsuite included">
 
-<!ENTITY grep-version "2.5.3">
-<!ENTITY grep-size "604 KB">
+<!ENTITY grep-version "2.5.4">
+<!ENTITY grep-size "706 KB">
 <!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.bz2">
-<!ENTITY grep-md5 "27061ce1fde82876970b6549a156da8b">
+<!ENTITY grep-md5 "5650ee2ae6ea4b39e9459d7d0585b315">
 <!ENTITY grep-home "&gnu-software;grep/">
 <!ENTITY grep-ch5-du "6.9 MB">
 <!ENTITY grep-ch5-sbu "0.1 SBU">
diff --git a/patches.ent b/patches.ent
index 2c41cbaa0..d4cdf0e97 100644
--- a/patches.ent
+++ b/patches.ent
@@ -60,10 +60,6 @@
 <!ENTITY grep-debian-patch-md5 "337d017202d7e3b08d428a89da3ee572">
 <!ENTITY grep-debian-patch-size "27 KB">
 
-<!ENTITY grep-fixes-patch "grep-&grep-version;-upstream_fixes-1.patch">
-<!ENTITY grep-fixes-patch-md5 "44f9c5e7df7746e6115be47e5a068ab8">
-<!ENTITY grep-fixes-patch-size "5.8 KB">
-
 
 <!ENTITY grub-inode-patch "grub-&grub-version;-256byte_inode-1.patch">
 <!ENTITY grub-inode-patch-md5 "2482bef9c1866b4045767a56268ba673">