diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 30d83b50e..503e3f240 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
     <listitem>
       <para>2009-03-11</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgraded to Tar-1.22. Fixes
+          <ulink url="&lfs-ticket-root;2358">#2358</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgraded to Readline-6.0. Fixes
           <ulink url="&lfs-ticket-root;2353">#2353</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 1fbb3033d..9ba6ced51 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -244,14 +244,6 @@
       <para>&patch-fixes-patch;</para>
     </listitem>
 
-    <listitem>
-      <para>&tar-testsuite-patch;</para>
-    </listitem>
-
-    <listitem>
-      <para>&tar-warning-patch;</para>
-    </listitem>
-
     <listitem>
       <para>&vim-fixes-patch;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index f409f218c..d7b522570 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -202,22 +202,6 @@
       </listitem>
     </varlistentry> -->
 
-    <varlistentry>
-      <term>Tar Testsuite Patch - <token>&tar-testsuite-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&tar-testsuite-patch;"/></para>
-        <para>MD5 sum: <literal>&tar-testsuite-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Tar Warning Removal Patch - <token>&tar-warning-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&tar-warning-patch;"/></para>
-        <para>MD5 sum: <literal>&tar-warning-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Vim Fixes Patch - <token>&vim-fixes-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter05/tar.xml b/chapter05/tar.xml
index 6c0666903..6d3b9b162 100644
--- a/chapter05/tar.xml
+++ b/chapter05/tar.xml
@@ -43,12 +43,6 @@
   <sect2 role="installation">
     <title>Installation of Tar</title>
 
-    <para>Apply 2 patches, which correct a bug in Tar's testsuite and suppress
-    a warning that affects Perl's testsuite:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&tar-testsuite-patch;
-patch -Np1 -i ../&tar-warning-patch;</userinput></screen>
-
     <para>Prepare Tar for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
diff --git a/chapter06/tar.xml b/chapter06/tar.xml
index f774b0205..a5baf9431 100644
--- a/chapter06/tar.xml
+++ b/chapter06/tar.xml
@@ -40,12 +40,6 @@
   <sect2 role="installation">
     <title>Installation of Tar</title>
 
-    <para>Apply 2 patches, which correct a bug in Tar's testsuite and suppress
-    a warning that affects Perl's testsuite:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&tar-testsuite-patch;
-patch -Np1 -i ../&tar-warning-patch;</userinput></screen>
-
     <para>Prepare Tar for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
diff --git a/packages.ent b/packages.ent
index 89c48be9c..5c21c2e90 100644
--- a/packages.ent
+++ b/packages.ent
@@ -464,10 +464,10 @@
 <!ENTITY sysvinit-ch6-du "1 MB">
 <!ENTITY sysvinit-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY tar-version "1.21">
-<!ENTITY tar-size "2,023 KB">
+<!ENTITY tar-version "1.22">
+<!ENTITY tar-size "2,046 KB">
 <!ENTITY tar-url "&gnu;tar/tar-&tar-version;.tar.bz2">
-<!ENTITY tar-md5 "4f9028d231c3e7d7bdd658e14e74c2d1">
+<!ENTITY tar-md5 "07fa517027f426bb80f5f5ff91b63585">
 <!ENTITY tar-home "&gnu-software;tar/">
 <!ENTITY tar-ch5-du "19.9 MB">
 <!ENTITY tar-ch5-sbu "0.3 SBU">
diff --git a/patches.ent b/patches.ent
index 684451bd6..d519b3b86 100644
--- a/patches.ent
+++ b/patches.ent
@@ -102,15 +102,6 @@
 <!ENTITY shadow-useradd-patch-size "6.1 KB"> -->
 
 
-<!ENTITY tar-testsuite-patch "tar-&tar-version;-testsuite_fix-1.patch">
-<!ENTITY tar-testsuite-patch-md5 "b2f08aa96e947f7dca8920bff13b58e5">
-<!ENTITY tar-testsuite-patch-size "3 KB">
-
-
-<!ENTITY tar-warning-patch "tar-&tar-version;-remove_warning-1.patch">
-<!ENTITY tar-warning-patch-md5 "c7247a20a158ac7d25f02537c4069663">
-<!ENTITY tar-warning-patch-size "1.4 KB">
-
 <!ENTITY vim-fixes-patch "vim-&vim-version;-fixes-4.patch">
 <!ENTITY vim-fixes-patch-md5 "87056fb6fd7bc3df5cd328e26a83bf43">
 <!ENTITY vim-fixes-patch-size "166 KB">