Index: general.ent
===================================================================
--- general.ent	(revision f02583f94ae389571fe77475960b71d72ac940bd)
+++ general.ent	(revision c7cb25b4c200ac195ce07eebf3255ce479590af6)
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "July 30 &year;">
+<!ENTITY releasedate  "July 30th &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision f02583f94ae389571fe77475960b71d72ac940bd)
+++ introduction/welcome/changelog.xml	(revision c7cb25b4c200ac195ce07eebf3255ce479590af6)
@@ -46,4 +46,16 @@
       <para>July 30th, 2017</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to faad-2.8.1. Fixes
+          <ulink url="&blfs-ticket-root;9492">#9492</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to faac-1.29.3. Fixes
+          <ulink url="&blfs-ticket-root;9416">#9416</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xfce4-terminal-0.8.6. Fixes
+          <ulink url="&blfs-ticket-root;9485">#9485</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[dj] - Update to Node.js-8.2.1. Fixes
Index: multimedia/libdriv/faac.xml
===================================================================
--- multimedia/libdriv/faac.xml	(revision f02583f94ae389571fe77475960b71d72ac940bd)
+++ multimedia/libdriv/faac.xml	(revision c7cb25b4c200ac195ce07eebf3255ce479590af6)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY faac-download-http "&sourceforge-repo;/faac/faac-&faac-version;.tar.bz2">
+  <!ENTITY faac-download-http "&sourceforge-repo;/faac/faac-&faac-version;.tar.gz">
   <!ENTITY faac-download-ftp  " ">
-  <!ENTITY faac-md5sum        "6d3d7e8f5eb54438bdd9300223993acd">
-  <!ENTITY faac-size          "300 KB">
-  <!ENTITY faac-buildsize     "13 MB">
-  <!ENTITY faac-time          "0.1 SBU">
+  <!ENTITY faac-md5sum        "20108ccff238813937ae1fec6eb80e7c">
+  <!ENTITY faac-size          "220 KB">
+  <!ENTITY faac-buildsize     "5.1 MB">
+  <!ENTITY faac-time          "less than 0.1 SBU">
 ]>
 
@@ -61,13 +61,4 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">FAAC Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para>libmp4v2 from
-    <ulink url="http://mpeg4ip.sourceforge.net/">mpeg4ip</ulink> (untested,
-    as of 2007-09-28, development of the project is stopped;
-    an internal version of the library is used if the external one
-    is not found).</para>
-
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/faac"/></para>
@@ -85,5 +76,4 @@
 ./bootstrap &amp;&amp;
 
-CFLAGS=-std=c99 CXXFLAGS=-std=c++98 \
 ./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
@@ -115,16 +105,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <!-- <para><command>./bootstrap</command>: This command runs GNU Autotools
-    to create the <command>configure</command> script and other required
-    build files.</para> -->
-
-    <!-- Note to editors: remove this sed if the new release re-enables the
-     option (look for "#if 0" near "case OBJTYPE_FLAG:", this is line
-     697 in frontend/main.c as of FAAC-1.26) or fixes the documentation
-     so that it doesn't mention the disabled option. -->
-    
-    <para><envar>CFLAGS=... CXXFLAGS=...</envar>: These environment
-    variables fix a problem with compiling under GCC-6.x.</para>
 
     <para><command>sed -i ...</command>: This command removes documentation
Index: multimedia/libdriv/faad2.xml
===================================================================
--- multimedia/libdriv/faad2.xml	(revision f02583f94ae389571fe77475960b71d72ac940bd)
+++ multimedia/libdriv/faad2.xml	(revision c7cb25b4c200ac195ce07eebf3255ce479590af6)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY faad2-download-http "&sourceforge-repo;/faac/faad2-&faad2-version;.tar.bz2">
+  <!ENTITY faad2-download-http "&sourceforge-repo;/faac/faad2-&faad2-version;.tar.gz">
   <!ENTITY faad2-download-ftp  " ">
-  <!ENTITY faad2-md5sum        "0404cb32b1cf0ffecc8e31eab0d10c2f">
-  <!ENTITY faad2-size          "640 KB">
-  <!ENTITY faad2-buildsize     "16 MB (without media player plugins)">
-  <!ENTITY faad2-time          "0.2 SBU (without media player plugins)">
+  <!ENTITY faad2-md5sum        "45f0593e99e97785c5ba79875a4e30a7">
+  <!ENTITY faad2-size          "784 KB">
+  <!ENTITY faad2-buildsize     "16 MB">
+  <!ENTITY faad2-time          "0.2 SBU">
 ]>
 
Index: packages.ent
===================================================================
--- packages.ent	(revision f02583f94ae389571fe77475960b71d72ac940bd)
+++ packages.ent	(revision c7cb25b4c200ac195ce07eebf3255ce479590af6)
@@ -641,5 +641,5 @@
 <!ENTITY mousepad-version             "0.4.0">
 <!ENTITY vte2-version                 "0.28.2">
-<!ENTITY xfce4-terminal-version       "0.8.5.1">
+<!ENTITY xfce4-terminal-version       "0.8.6">
 <!ENTITY xfburn-version               "0.5.4">
 <!ENTITY ristretto-version            "0.8.2">
@@ -752,6 +752,6 @@
 <!ENTITY alsa-oss-version             "1.0.28">
 <!ENTITY audiofile-version            "0.3.6">
-<!ENTITY faac-version                 "1.29">
-<!ENTITY faad2-version                "2.8.0">
+<!ENTITY faac-version                 "1.29.3">
+<!ENTITY faad2-version                "2.8.1">
 <!ENTITY fdk-aac-version              "0.1.5">
 <!ENTITY flac-version                 "1.3.2">
Index: server/major/apache.xml
===================================================================
--- server/major/apache.xml	(revision f02583f94ae389571fe77475960b71d72ac940bd)
+++ server/major/apache.xml	(revision c7cb25b4c200ac195ce07eebf3255ce479590af6)
@@ -136,6 +136,5 @@
     </para>
 
-<screen><userinput>
-patch -Np1 -i ../httpd-&apache-version;-blfs_layout-1.patch   &amp;&amp;
+<screen><userinput>patch -Np1 -i ../httpd-&apache-version;-blfs_layout-1.patch             &amp;&amp;
 
 sed '/dir.*CFG_PREFIX/s@^@#@' -i support/apxs.in              &amp;&amp;
Index: x/wm/icewm.xml
===================================================================
--- x/wm/icewm.xml	(revision f02583f94ae389571fe77475960b71d72ac940bd)
+++ x/wm/icewm.xml	(revision c7cb25b4c200ac195ce07eebf3255ce479590af6)
@@ -83,6 +83,5 @@
     commands:</para>
 
-<screen><userinput>
-./configure --prefix=/usr                     \
+<screen><userinput>./configure --prefix=/usr                     \
             --sysconfdir=/etc                 \
             --docdir=/usr/share/icewm-&icewm-version; &amp;&amp;
Index: xfce/apps/xfce4-terminal.xml
===================================================================
--- xfce/apps/xfce4-terminal.xml	(revision f02583f94ae389571fe77475960b71d72ac940bd)
+++ xfce/apps/xfce4-terminal.xml	(revision c7cb25b4c200ac195ce07eebf3255ce479590af6)
@@ -8,6 +8,6 @@
            "http://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-&xfce4-terminal-version;.tar.bz2">
   <!ENTITY xfce4-terminal-download-ftp  " ">
-  <!ENTITY xfce4-terminal-md5sum        "235345e25547c13d11d13fc6a1db7f03">
-  <!ENTITY xfce4-terminal-size          "924 KB">
+  <!ENTITY xfce4-terminal-md5sum        "92f5a3366e30f5f8238d8250f730b6af">
+  <!ENTITY xfce4-terminal-size          "932 KB">
   <!ENTITY xfce4-terminal-buildsize     "13 MB">
   <!ENTITY xfce4-terminal-time          "0.1 SBU">
