Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 3c0135c844a8c432f6a88fe3a4be8c8c4046911b)
+++ chapter01/changelog.xml	(revision 968c7be054bbc38b6472f4f94f4a1924a37fc92a)
@@ -39,4 +39,8 @@
       <para>2007-06-30</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Tar-1.18, fixes
+          <ulink url="&lfs-ticket-root;2039">#2039</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to Libtool-1.5.24, fixes
Index: chapter01/whatsnew.xml
===================================================================
--- chapter01/whatsnew.xml	(revision 3c0135c844a8c432f6a88fe3a4be8c8c4046911b)
+++ chapter01/whatsnew.xml	(revision 968c7be054bbc38b6472f4f94f4a1924a37fc92a)
@@ -221,7 +221,4 @@
     </listitem>
     <listitem>
-      <para>&tar-sort-exclude-test-patch;</para>
-    </listitem>
-    <listitem>
       <para>&util-linux-lseek-patch;</para>
     </listitem>
Index: chapter03/patches.xml
===================================================================
--- chapter03/patches.xml	(revision 3c0135c844a8c432f6a88fe3a4be8c8c4046911b)
+++ chapter03/patches.xml	(revision 968c7be054bbc38b6472f4f94f4a1924a37fc92a)
@@ -220,12 +220,4 @@
 
     <varlistentry>
-      <term>Tar Sort Exclude Test Patch - <token>&tar-sort-exclude-test-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&tar-sort-exclude-test-patch;"/></para>
-        <para>MD5 sum: <literal>&tar-sort-exclude-test-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Texinfo Multibyte Fixes Patch - <token>&texinfo-multibyte-patch-size;</token>:</term>
       <listitem>
Index: chapter05/tar.xml
===================================================================
--- chapter05/tar.xml	(revision 3c0135c844a8c432f6a88fe3a4be8c8c4046911b)
+++ chapter05/tar.xml	(revision 968c7be054bbc38b6472f4f94f4a1924a37fc92a)
@@ -38,12 +38,4 @@
     <title>Installation of Tar</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../chapter06/tar.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../chapter06/tar.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
     <para>Prepare Tar for compilation:</para>
 
Index: chapter06/tar.xml
===================================================================
--- chapter06/tar.xml	(revision 3c0135c844a8c432f6a88fe3a4be8c8c4046911b)
+++ chapter06/tar.xml	(revision 968c7be054bbc38b6472f4f94f4a1924a37fc92a)
@@ -34,11 +34,4 @@
   <sect2 role="installation">
     <title>Installation of Tar</title>
-
-    <para os="a">One of the tests in the testsuite (number 12, exclude) fails,
-    at least on recent linux systems, because the output needs to be sorted
-    before it is diffed. If you are going to run the testsuite, fix this by
-    applying the following patch before you configure: </para>
-
-<screen os="b"><userinput>patch -Np1 -i ../&tar-sort-exclude-test-patch;</userinput></screen>
 
     <para>Prepare Tar for compilation:</para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 3c0135c844a8c432f6a88fe3a4be8c8c4046911b)
+++ packages.ent	(revision 968c7be054bbc38b6472f4f94f4a1924a37fc92a)
@@ -455,8 +455,8 @@
 <!ENTITY sysvinit-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY tar-version "1.17">
-<!ENTITY tar-size "1,839 KB">
+<!ENTITY tar-version "1.18">
+<!ENTITY tar-size "1,833 KB">
 <!ENTITY tar-url "&gnu;tar/tar-&tar-version;.tar.bz2">
-<!ENTITY tar-md5 "c6c4f1c075dbf0f75c29737faa58f290">
+<!ENTITY tar-md5 "70170208d7c1bb9ab40120579434b6a3">
 <!ENTITY tar-home "&gnu-software;tar/">
 <!ENTITY tar-ch5-du "19.9 MB">
Index: patches.ent
===================================================================
--- patches.ent	(revision 3c0135c844a8c432f6a88fe3a4be8c8c4046911b)
+++ patches.ent	(revision 968c7be054bbc38b6472f4f94f4a1924a37fc92a)
@@ -121,9 +121,4 @@
 
 
-<!ENTITY tar-sort-exclude-test-patch "tar-&tar-version;-sort_exclude_test-1.patch">
-<!ENTITY tar-sort-exclude-test-patch-md5 "69326a1d462dad67db495a42854a93c7">
-<!ENTITY tar-sort-exclude-test-patch-size "3.1 KB">
-
-
 <!ENTITY texinfo-multibyte-patch "texinfo-&texinfo-version;-multibyte-1.patch">
 <!ENTITY texinfo-multibyte-patch-md5 "6cb5b760cfdd2dd53a0430eb572a8aaa">
