Index: BOOK/final-system/common/bzip2.xml
===================================================================
--- BOOK/final-system/common/bzip2.xml	(revision 0de6e24fda1414f2fee2e15f10e4bcffe5f410cd)
+++ BOOK/final-system/common/bzip2.xml	(revision 1f3f3d361f65cfec1d55b638a2b534229b448c64)
@@ -27,21 +27,4 @@
   <sect2 role="installation">
     <title>Installation of Bzip2</title>
-
-    <para os="p1">Apply a patch to install the documentation for this
-    package:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&bzip2-docs-patch;</userinput></screen>
-
-    <para os="p3">The <command>bzgrep</command> command does not escape '|' and
-    '&amp;' in filenames passed to it. This allows arbitrary commands to be
-    executed with the privileges of the user running <command>bzgrep</command>.
-    Apply the following patch to address this:</para>
-
-<screen os="p4"><userinput>patch -Np1 -i ../&bzip2-bzgrep-patch;</userinput></screen>
-
-    <para os="p5">The <command>bzdiff</command> script depends on tempfile.
-    We remove that dependency with this patch:</para>
-
-<screen os="p6"><userinput>patch -Np1 -i ../&bzip2-remove_tempfile-patch;</userinput></screen>
 
     <para os="s1">Bzip2's default Makefile target automatically runs
Index: BOOK/general.ent
===================================================================
--- BOOK/general.ent	(revision 0de6e24fda1414f2fee2e15f10e4bcffe5f410cd)
+++ BOOK/general.ent	(revision 1f3f3d361f65cfec1d55b638a2b534229b448c64)
@@ -3,5 +3,5 @@
 <!ENTITY month "01"> <!-- Use two digits -->
 <!ENTITY month_name "January">
-<!ENTITY day "04"> <!-- Use two digits -->
+<!ENTITY day "07"> <!-- Use two digits -->
 <!ENTITY year "2007"> <!-- Use four digits -->
 
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 0de6e24fda1414f2fee2e15f10e4bcffe5f410cd)
+++ BOOK/introduction/common/changelog.xml	(revision 1f3f3d361f65cfec1d55b638a2b534229b448c64)
@@ -36,4 +36,13 @@
     </listitem>
 -->
+
+    <listitem>
+      <para>January 7, 2007</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Updated Bzip to 1.0.4.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: BOOK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision 0de6e24fda1414f2fee2e15f10e4bcffe5f410cd)
+++ BOOK/materials/common/patches.xml	(revision 1f3f3d361f65cfec1d55b638a2b534229b448c64)
@@ -47,31 +47,4 @@
 
     <varlistentry>
-      <term>Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&bzip2-docs-patch;"/></para>
-        <para>MD5 sum: <literal>&bzip2-docs-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Bzip2 Bzdiff Remove Tempfile - <token>&bzip2-remove_tempfile-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&bzip2-remove_tempfile-patch;"/></para>
-        <para>MD5 sum: <literal>&bzip2-remove_tempfile-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Bzip2 Bzgrep Security Fixes Patch - <token>&bzip2-bzgrep-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&bzip2-bzgrep-patch;"/></para>
-        <para>MD5 sum: <literal>&bzip2-bzgrep-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Coreutils Suppress Uptime, Kill, Su Patch - <token>&coreutils-suppress-patch-size;</token>:</term>
       <listitem>
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision 0de6e24fda1414f2fee2e15f10e4bcffe5f410cd)
+++ BOOK/packages.ent	(revision 1f3f3d361f65cfec1d55b638a2b534229b448c64)
@@ -43,8 +43,8 @@
 <!ENTITY bison-home "&gnu-software;bison/">
 
-<!ENTITY bzip2-version "1.0.3">
-<!ENTITY bzip2-size "654 KB">
+<!ENTITY bzip2-version "1.0.4">
+<!ENTITY bzip2-size "828 KB">
 <!ENTITY bzip2-url "http://www.bzip.org/&bzip2-version;/bzip2-&bzip2-version;.tar.gz">
-<!ENTITY bzip2-md5 "8a716bebecb6e647d2e8a29ea5d8447f">
+<!ENTITY bzip2-md5 "fc310b254f6ba5fbb5da018f04533688">
 <!ENTITY bzip2-home "http://www.bzip.org/">
 
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision 0de6e24fda1414f2fee2e15f10e4bcffe5f410cd)
+++ BOOK/patches.ent	(revision 1f3f3d361f65cfec1d55b638a2b534229b448c64)
@@ -16,16 +16,4 @@
 <!ENTITY binutils-posix-patch-md5 "7e42a8edc0c59246bbc58c428256113c">
 <!ENTITY binutils-posix-patch-size "4.9 KB">
-
-<!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
-<!ENTITY bzip2-docs-patch-md5 "9e5dfbf4814b71ef986b872c9af84488">
-<!ENTITY bzip2-docs-patch-size "1.7 KB">
-
-<!ENTITY bzip2-remove_tempfile-patch "bzip2-&bzip2-version;-remove_tempfile-1.patch">
-<!ENTITY bzip2-remove_tempfile-patch-md5 "bcadb0ce282c96af15a86a2ccdac0765">
-<!ENTITY bzip2-remove_tempfile-patch-size "1.8 KB">
-
-<!ENTITY bzip2-bzgrep-patch "bzip2-&bzip2-version;-bzgrep_security-1.patch">
-<!ENTITY bzip2-bzgrep-patch-md5 "4eae50e4fd690498f23d3057dfad7066">
-<!ENTITY bzip2-bzgrep-patch-size "1.3 KB">
 
 <!ENTITY coreutils-suppress-patch "coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch">
