Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 05899b4bcdef223b06182eac1ed53d2b257f0b55)
+++ introduction/welcome/changelog.xml	(revision c5eb8ede261d3f5c9dd0cea1012ecc3e71b94ea6)
@@ -46,4 +46,20 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Add sed to cdrdao to make compatible with
+          lame-3.100.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Move vte2 to lxde chapter from xfce.
+          It is no longer used in xfce, but it is in lxde.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Thunar-1.7.0. Fixes
+          <ulink url="&blfs-ticket-root;10072">#10072</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to exo-0.11.5. Marked as development,
+          but needed for Thunar-1.7.0.</para>
+        </listitem>
+        <listitem>
           <para>[dj] - Correct PAM module dir for libpwquality and gdm.</para>
         </listitem>
Index: lxde/apps/apps.xml
===================================================================
--- lxde/apps/apps.xml	(revision 05899b4bcdef223b06182eac1ed53d2b257f0b55)
+++ lxde/apps/apps.xml	(revision c5eb8ede261d3f5c9dd0cea1012ecc3e71b94ea6)
@@ -26,4 +26,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxrandr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxtask.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vte2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxterminal.xml"/>
 
Index: lxde/apps/vte2.xml
===================================================================
--- lxde/apps/vte2.xml	(revision c5eb8ede261d3f5c9dd0cea1012ecc3e71b94ea6)
+++ lxde/apps/vte2.xml	(revision c5eb8ede261d3f5c9dd0cea1012ecc3e71b94ea6)
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY vte2-download-http "&gnome-download-http;/vte/0.28/vte-&vte2-version;.tar.xz">
+  <!ENTITY vte2-download-ftp  "&gnome-download-ftp;/vte/0.28/vte-&vte2-version;.tar.xz">
+  <!ENTITY vte2-md5sum        "497f26e457308649e6ece32b3bb142ff">
+  <!ENTITY vte2-size          "940 KB">
+  <!ENTITY vte2-buildsize     "33 MB">
+  <!ENTITY vte2-time          "0.5 SBU">
+]>
+
+<sect1 id="vte2" xreflabel="Vte-&vte2-version;">
+  <?dbhtml filename="vte2.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Vte-&vte2-version;</title>
+
+  <indexterm zone="vte2">
+    <primary sortas="a-Vte">Vte</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Vte</title>
+
+    <para>
+      <application>Vte</application> is a library (libvte) implementing a
+      terminal emulator widget for <application>GTK+ 2</application>, and a
+      minimal demonstration application (vte) that uses
+      <application>libvte</application>.
+    </para>
+
+    &lfs81_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&vte2-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&vte2-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &vte2-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &vte2-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &vte2-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &vte2-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Vte Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gtk2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="gtk-doc"/> and
+      <xref linkend="pygtk"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/vte2"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Vte</title>
+
+    <para>
+      Install <application>Vte</application> by running the following
+      commands:
+    </para>
+
+<!-- both vte2 and vte3 install the same file in libexecdir, so overwrite this one -->
+<screen><userinput>./configure --prefix=/usr \
+            --libexecdir=/usr/lib/vte \
+            --disable-static  &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+     <parameter>--libexecdir=/usr/lib/vte</parameter> : both this package and
+     <xref linkend="vte"/> install files of the same name. This switch ensures
+     that they do not overwrite each other if both are installed.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          vte
+        </seg>
+        <seg>
+          libvte.so
+        </seg>
+        <seg>
+          /usr/include/vte-0.0,
+          /usr/lib/vte,
+          /usr/share/gtk-doc/html/vte-0.0 and
+          /usr/share/vte
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="vte2-prog">
+        <term><command>vte</command></term>
+        <listitem>
+          <para>
+            is a simple terminal emulator.
+          </para>
+          <indexterm zone="vte2 vte2-prog">
+            <primary sortas="b-vte">vte</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libvte2">
+        <term><filename class="libraryfile">libvte.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Vte</application> API functions.
+          </para>
+          <indexterm zone="vte2 libvte2">
+            <primary sortas="c-libvte">libvte.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: multimedia/cdwriteutils/cdrdao.xml
===================================================================
--- multimedia/cdwriteutils/cdrdao.xml	(revision 05899b4bcdef223b06182eac1ed53d2b257f0b55)
+++ multimedia/cdwriteutils/cdrdao.xml	(revision c5eb8ede261d3f5c9dd0cea1012ecc3e71b94ea6)
@@ -76,6 +76,8 @@
     commands:</para>
 
-<screen><userinput>sed -i '/ioctl.h/a #include &lt;sys/stat.h&gt;' dao/ScsiIf-linux.cc  &amp;&amp;
-sed -i 's/\(char .*REMOTE\)/unsigned \1/' dao/CdrDriver.{cc,h} &amp;&amp;
+<screen><userinput>
+sed -i '/ioctl.h/a #include &lt;sys/stat.h&gt;' dao/ScsiIf-linux.cc             &amp;&amp;
+sed -i 's/\(char .*REMOTE\)/unsigned \1/' dao/CdrDriver.{cc,h}            &amp;&amp;
+sed -i 's/bitrate_table.1..i./lame_get_bitrate(1, i)/g' utils/toc2mp3.cc  &amp;&amp;
 
 ./configure --prefix=/usr --mandir=/usr/share/man &amp;&amp;
@@ -104,4 +106,9 @@
       sed stops <application>gcc-6.1</application> from stopping the build
       due to C++ now treating an 'int' to 'char' conversion as an error.
+    </para>
+
+    <para>
+      <command>sed -i ... bitrate_table ...</command>: This
+      sed is needed for compatibility with LAME-3.100.
     </para>
 
Index: packages.ent
===================================================================
--- packages.ent	(revision 05899b4bcdef223b06182eac1ed53d2b257f0b55)
+++ packages.ent	(revision c5eb8ede261d3f5c9dd0cea1012ecc3e71b94ea6)
@@ -635,5 +635,5 @@
 <!ENTITY xfconf-version               "4.12.1">
 <!ENTITY libxfce4ui-version           "4.12.1">
-<!ENTITY exo-version                  "0.10.7">
+<!ENTITY exo-version                  "0.11.5">
 <!ENTITY garcon-version               "0.6.1">
 <!ENTITY gtk-xfce-engine-version      "3.2.0">
@@ -642,5 +642,5 @@
 <!ENTITY xfce4-panel-version          "4.12.1">
 <!ENTITY xfce4-xkb-plugin-version     "0.7.1">
-<!ENTITY thunar-version               "1.6.12">
+<!ENTITY thunar-version               "1.7.0">
 <!ENTITY thunar-volman-version        "0.8.1">
 <!ENTITY tumbler-version              "0.2.0">
Index: xfce/apps/apps.xml
===================================================================
--- xfce/apps/apps.xml	(revision 05899b4bcdef223b06182eac1ed53d2b257f0b55)
+++ xfce/apps/apps.xml	(revision c5eb8ede261d3f5c9dd0cea1012ecc3e71b94ea6)
@@ -21,8 +21,5 @@
   </para>
 
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="midori.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="parole.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mousepad.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vte2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-terminal.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfburn.xml"/>
Index: ce/apps/vte2.xml
===================================================================
--- xfce/apps/vte2.xml	(revision 05899b4bcdef223b06182eac1ed53d2b257f0b55)
+++ 	(revision )
@@ -1,191 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY vte2-download-http "&gnome-download-http;/vte/0.28/vte-&vte2-version;.tar.xz">
-  <!ENTITY vte2-download-ftp  "&gnome-download-ftp;/vte/0.28/vte-&vte2-version;.tar.xz">
-  <!ENTITY vte2-md5sum        "497f26e457308649e6ece32b3bb142ff">
-  <!ENTITY vte2-size          "940 KB">
-  <!ENTITY vte2-buildsize     "33 MB">
-  <!ENTITY vte2-time          "0.5 SBU">
-]>
-
-<sect1 id="vte2" xreflabel="Vte-&vte2-version;">
-  <?dbhtml filename="vte2.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Vte-&vte2-version;</title>
-
-  <indexterm zone="vte2">
-    <primary sortas="a-Vte">Vte</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Vte</title>
-
-    <para>
-      <application>Vte</application> is a library (libvte) implementing a
-      terminal emulator widget for <application>GTK+ 2</application>, and a
-      minimal demonstration application (vte) that uses
-      <application>libvte</application>.
-    </para>
-
-    &lfs81_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&vte2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&vte2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &vte2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &vte2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &vte2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &vte2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Vte Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="pygtk"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/vte2"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Vte</title>
-
-    <para>
-      Install <application>Vte</application> by running the following
-      commands:
-    </para>
-
-<!-- both vte2 and vte3 install the same file in libexecdir, so overwrite this one -->
-<screen><userinput>./configure --prefix=/usr \
-            --libexecdir=/usr/lib/vte \
-            --disable-static  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-     <parameter>--libexecdir=/usr/lib/vte</parameter> : both this package and
-     <xref linkend="vte"/> install files of the same name. This switch ensures
-     that they do not overwrite each other if both are installed.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          vte
-        </seg>
-        <seg>
-          libvte.so
-        </seg>
-        <seg>
-          /usr/include/vte-0.0,
-          /usr/lib/vte,
-          /usr/share/gtk-doc/html/vte-0.0 and
-          /usr/share/vte
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="vte2-prog">
-        <term><command>vte</command></term>
-        <listitem>
-          <para>
-            is a simple terminal emulator.
-          </para>
-          <indexterm zone="vte2 vte2-prog">
-            <primary sortas="b-vte">vte</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libvte2">
-        <term><filename class="libraryfile">libvte.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Vte</application> API functions.
-          </para>
-          <indexterm zone="vte2 libvte2">
-            <primary sortas="c-libvte">libvte.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xfce/core/exo.xml
===================================================================
--- xfce/core/exo.xml	(revision 05899b4bcdef223b06182eac1ed53d2b257f0b55)
+++ xfce/core/exo.xml	(revision c5eb8ede261d3f5c9dd0cea1012ecc3e71b94ea6)
@@ -6,10 +6,10 @@
 
   <!ENTITY exo-download-http
-           "http://archive.xfce.org/src/xfce/exo/0.10/exo-&exo-version;.tar.bz2">
+           "http://archive.xfce.org/src/xfce/exo/0.11/exo-&exo-version;.tar.bz2">
   <!ENTITY exo-download-ftp  " ">
-  <!ENTITY exo-md5sum        "92ca200b8787cdd7494164cbc0ed8200">
+  <!ENTITY exo-md5sum        "2e560edfa8ddf77e21c4787a6f600171">
   <!ENTITY exo-size          "1.2 MB">
-  <!ENTITY exo-buildsize     "22 MB (with tests)">
-  <!ENTITY exo-time          "0.2 SBU (with tests)">
+  <!ENTITY exo-buildsize     "25 MB (with tests)">
+  <!ENTITY exo-time          "0.3 SBU (with tests)">
 ]>
 
@@ -137,9 +137,11 @@
         </seg>
         <seg>
-          libexo-1.so
+          libexo-1.so and
+          libexo-2.so
         </seg>
         <seg>
           /etc/xdg/xfce4,
-          /usr/{include,lib/xfce4}/exo-1, and
+          /usr/{include,lib/xfce4}/exo-1, 
+          /usr/include/exo-2, and
           /usr/share/{{gtk-doc/html,pixmaps}/exo-1,xfce4}
         </seg>
Index: xfce/core/thunar.xml
===================================================================
--- xfce/core/thunar.xml	(revision 05899b4bcdef223b06182eac1ed53d2b257f0b55)
+++ xfce/core/thunar.xml	(revision c5eb8ede261d3f5c9dd0cea1012ecc3e71b94ea6)
@@ -8,7 +8,7 @@
            "http://archive.xfce.org/src/xfce/thunar/1.6/Thunar-&thunar-version;.tar.bz2">
   <!ENTITY thunar-download-ftp  " ">
-  <!ENTITY thunar-md5sum        "1bdf3c4a57ff886c512341f24b5e0e88">
-  <!ENTITY thunar-size          "1.8 MB">
-  <!ENTITY thunar-buildsize     "47 MB">
+  <!ENTITY thunar-md5sum        "60f0cb9928859aa94028d06f82dd9e1c">
+  <!ENTITY thunar-size          "2.1 MB">
+  <!ENTITY thunar-buildsize     "50 MB">
   <!ENTITY thunar-time          "0.5 SBU">
 ]>
