diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index e97d7413c..ab3087551 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -95,6 +95,7 @@ First a summary, then a detailed log.</para>
 <listitem><para>&glibc-testfix-patch;</para></listitem>
 <listitem><para>&perl-libc-patch;</para></listitem>
 <listitem><para>&mktemp-tempfile-patch;</para></listitem>
+<listitem><para>&util-linux-reiser_crash-patch;</para></listitem>
 <listitem><para>&vim-security_fix-patch;</para></listitem>
 </itemizedlist>
 </listitem>
@@ -114,6 +115,11 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>September 4, 2005 [matt]: Add patch to stop
+<command>cfdisk</command> segfaulting when invoked on devices with partitions
+that don't contain an e2fs, xfs or jfs filesystem (see bug 1604)</para>
+</listitem>
+
 <listitem><para>September 4, 2005 [matt]: Upgrade to libtool-1.5.20</para>
 </listitem>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index a12cedfe6..ed3b7bedc 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -155,6 +155,12 @@ needed to build an LFS system:</para>
 </listitem>
 </varlistentry>
 
+<varlistentry>
+<term>Util-linux Reiser Crash Patch - 2 KB:</term> <listitem>
+<para><ulink url="&patches-root;&util-linux-reiser_crash-patch;"/></para>
+</listitem>
+</varlistentry>
+
 <varlistentry>
 <term>Vim Security Patch - 9 KB:</term><listitem>
 <para><ulink url="&patches-root;&vim-security_fix-patch;"/></para>
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index eee00c416..dd5af25e6 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -53,6 +53,14 @@ The following patch properly fixes this issue:</para>
 
 <screen><userinput>patch -Np1 -i ../&util-linux-cramfs-patch;</userinput></screen>
 
+<para><command>cfdisk</command> segfaults if the disk contains a linux partition
+(type 83) that doesn't have an <systemitem class="filesystem">e2fs</systemitem>,
+<systemitem class="filesystem">xfs</systemitem> or
+<systemitem class="filesystem">jfs</systemitem> filesystem on it.  Apply the
+following patch to fix the problem:</para>
+
+<screen><userinput>patch -Np1 -i ../&util-linux-reiser_crash-patch;</userinput></screen>
+
 <para>Prepare Util-linux for compilation:</para>
 
 <screen><userinput>./configure</userinput></screen>
diff --git a/patches.ent b/patches.ent
index 4f344f3e1..b92caee5d 100644
--- a/patches.ent
+++ b/patches.ent
@@ -36,4 +36,6 @@
 
 <!ENTITY util-linux-cramfs-patch "util-linux-&util-linux-version;-cramfs-1.patch">
 
+<!ENTITY util-linux-reiser_crash-patch "util-linux-&util-linux-version;-reiser_crash-2.patch">
+
 <!ENTITY vim-security_fix-patch "vim-&vim-version;-security_fix-2.patch">