diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 68eede401..d9e3ae01e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>2013-02-18</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Upgrade to Coreutils-8.21.  Fixes
+          <ulink url="&lfs-ticket-root;3286">#3286</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Upgrade to Texinfo-5.0.  Fixes
           <ulink url="&lfs-ticket-root;3289">#3284</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 1ab5cb3ca..145de8d5a 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -239,11 +239,11 @@
     <listitem>
       <para>&coreutils-i18n-patch;</para>
     </listitem>
-
+<!--
     <listitem>
       <para>&coreutils-test-patch;</para>
     </listitem>
-
+-->
     <listitem>
       <para>&kbd-backspace-patch;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 24d5b3136..9007b10eb 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -50,6 +50,7 @@
       </listitem>
     </varlistentry>
 
+<!--
     <varlistentry>
       <term>Coreutils Test Fixes Patch - <token>&coreutils-test-patch-size;</token>:</term>
       <listitem>
@@ -57,6 +58,7 @@
         <para>MD5 sum: <literal>&coreutils-test-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
+-->
 
     <varlistentry>
       <term>Flex Regression Tests Patch - <token>&flex-bison-patch-size;</token>:</term>
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 8067b05c5..390cdbe31 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>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>
@@ -87,7 +87,7 @@
     <para>Now the test suite is ready to be run. First, run the tests that are
     meant to be run as user <systemitem class="username">root</systemitem>:</para>
 
-<screen><userinput remap="test">make NON_ROOT_USERNAME=nobody SUBDIRS= check-root</userinput></screen>
+<screen><userinput remap="test">make NON_ROOT_USERNAME=nobody check-root</userinput></screen>
 
     <para>We're going to run the remainder of the tests as the
     <systemitem class="username">nobody</systemitem> user. Certain tests,
diff --git a/packages.ent b/packages.ent
index 4cc141f18..e8e18a446 100644
--- a/packages.ent
+++ b/packages.ent
@@ -76,15 +76,15 @@
 <!ENTITY check-ch5-du "6.9 MB">
 <!ENTITY check-ch5-sbu "0.1 SBU">
 
-<!ENTITY coreutils-version "8.20">
-<!ENTITY coreutils-size "5,150 KB">
+<!ENTITY coreutils-version "8.21">
+<!ENTITY coreutils-size "5,248 KB">
 <!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.xz">
-<!ENTITY coreutils-md5 "3d69af8f561fce512538a9fe85f147ff">
+<!ENTITY coreutils-md5 "065ba41828644eca5dd8163446de5d64">
 <!ENTITY coreutils-home "&gnu-software;coreutils/">
-<!ENTITY coreutils-ch5-du "126 MB">
-<!ENTITY coreutils-ch5-sbu "0.7 SBU">
-<!ENTITY coreutils-ch6-du "154 MB">
-<!ENTITY coreutils-ch6-sbu "4.0 SBU">
+<!ENTITY coreutils-ch5-du "133 MB">
+<!ENTITY coreutils-ch5-sbu "0.8 SBU">
+<!ENTITY coreutils-ch6-du "116 MB">
+<!ENTITY coreutils-ch6-sbu "3.4 SBU">
 
 <!ENTITY dejagnu-version "1.5">
 <!ENTITY dejagnu-size "563 KB">
@@ -519,10 +519,10 @@
 <!ENTITY texinfo-url "&gnu;texinfo/texinfo-&texinfo-version;.tar.xz">
 <!ENTITY texinfo-md5 "ef2fad34c71ddc95b20c7d6a08c0d7a6">
 <!ENTITY texinfo-home "&gnu-software;texinfo/">
-<!ENTITY texinfo-ch5-du "24 MB">
-<!ENTITY texinfo-ch5-sbu "0.2 SBU">
-<!ENTITY texinfo-ch6-du "24 MB">
-<!ENTITY texinfo-ch6-sbu "0.2 SBU">
+<!ENTITY texinfo-ch5-du "94 MB">
+<!ENTITY texinfo-ch5-sbu "0.3 SBU">
+<!ENTITY texinfo-ch6-du "101 MB">
+<!ENTITY texinfo-ch6-sbu "0.6 SBU">
 
 <!ENTITY systemd-version "197">
 <!ENTITY systemd-size    "2,012 KB">
diff --git a/patches.ent b/patches.ent
index c3005b5cb..70d18b20a 100644
--- a/patches.ent
+++ b/patches.ent
@@ -14,13 +14,15 @@
 <!ENTITY bzip2-docs-patch-md5 "6a5ac7e89b791aae556de0f745916f7f">
 <!ENTITY bzip2-docs-patch-size "1.6 KB">
 
-<!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-2.patch">
-<!ENTITY coreutils-i18n-patch-md5 "b653d2313a22ddfe090ae583d22c7bce">
-<!ENTITY coreutils-i18n-patch-size "125 KB">
+<!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch">
+<!ENTITY coreutils-i18n-patch-md5 "ada0ea6e1c00c4b7e0d634f49827943e">
+<!ENTITY coreutils-i18n-patch-size "132 KB">
 
+<!--
 <!ENTITY coreutils-test-patch "coreutils-&coreutils-version;-test_fixes-1.patch">
 <!ENTITY coreutils-test-patch-md5 "69639d7e09e3cfc66f151879e6d5d23d">
 <!ENTITY coreutils-test-patch-size "1.5 KB">
+-->
 
 <!ENTITY flex-bison-patch "flex-&flex-version;-bison-2.6.1-1.patch">
 <!ENTITY flex-bison-patch-md5 "d5b001ef9bdbbe32e2f27576d97d8ff0">