diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 90dc2c09f..e426b6f58 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,6 +38,11 @@
     <listitem>
       <para>2014-03-22</para>
       <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Fix a segfault in shuf program from
+          Coreutils. Fixes
+          <ulink url="&lfs-ticket-root;3550">#3550</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[krejzi] - Fix a segfault in Acl package. Fixes
           <ulink url="&lfs-ticket-root;3549">#3549</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index c23042f97..ac422b5a6 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -238,6 +238,9 @@
     <listitem>
       <para>&bc-memory-leak-patch;</para>
     </listitem>
+    <listitem>
+      <para>&coreutils-shuf-segfault-patch;</para>
+    </listitem>
     <listitem>
       <para>dbus-&dbus-version;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 6c5e5230d..136863f7b 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -50,6 +50,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Coreutils shuf Segmentation Fault Fix Patch - <token>&coreutils-shuf-segfault-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&coreutils-shuf-segfault-patch;"/></para>
+        <para>MD5 sum: <literal>&coreutils-shuf-segfault-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Glibc FHS Patch - <token>&glibc-fhs-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 9d9acf163..1f2fba108 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -40,11 +40,11 @@
 
   <sect2 role="installation">
     <title>Installation of Coreutils</title>
-<!--
-    <para>Fix a couple of test failures:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-test-patch;</userinput></screen>
--->
+    <para>First, fix a segfault in <command>shuf</command> program:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-shuf-segfault-patch;</userinput></screen>
+
     <para>POSIX requires that programs from Coreutils recognize character
     boundaries correctly even in multibyte locales. The following patch
     fixes this non-compliance and other internationalization-related bugs:</para>
diff --git a/patches.ent b/patches.ent
index 5e120dfb4..a6fe451a9 100644
--- a/patches.ent
+++ b/patches.ent
@@ -18,6 +18,10 @@
 <!ENTITY coreutils-i18n-patch-md5 "54c99871cd0ca20f29bdc9462e27f0df">
 <!ENTITY coreutils-i18n-patch-size "140 KB">
 
+<!ENTITY coreutils-shuf-segfault-patch "coreutils-&coreutils-version;-shuf-segfault-1.patch">
+<!ENTITY coreutils-shuf-segfault-patch-md5 "f1b5b35392914e327b1b6bbbb454d256">
+<!ENTITY coreutils-shuf-segfault-patch-size "4 KB">
+
 <!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
 <!ENTITY glibc-fhs-patch-size "2.8 KB">