Index: general.ent
===================================================================
--- general.ent	(revision f37810e50f80e0e10c65d746605a0a8783a16692)
+++ general.ent	(revision 06eea232619791e969e9e473b4b48965a5582d81)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "18">                   <!-- Always 2 digits -->
+<!ENTITY day          "19">                   <!-- Always 2 digits -->
 <!ENTITY month        "08">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS systemd Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "August 18th, &year;">
+<!ENTITY releasedate  "August 19th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "systemd">              <!-- svn|[release #] -->
Index: general/genlib/libassuan.xml
===================================================================
--- general/genlib/libassuan.xml	(revision f37810e50f80e0e10c65d746605a0a8783a16692)
+++ general/genlib/libassuan.xml	(revision 06eea232619791e969e9e473b4b48965a5582d81)
@@ -8,7 +8,7 @@
   <!ENTITY libassuan-download-ftp
            "ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-&libassuan-version;.tar.bz2">
-  <!ENTITY libassuan-md5sum        "757243cc4a71b30ed8d8dbe784035d36">
-  <!ENTITY libassuan-size          "532 KB">
-  <!ENTITY libassuan-buildsize     "7.3 MB">
+  <!ENTITY libassuan-md5sum        "1dc4c3e1dbfb3939bfa2d72db8e136ba">
+  <!ENTITY libassuan-size          "504 KB">
+  <!ENTITY libassuan-buildsize     " 5.6 MB (additional 0.1 MB for the tests and 2.1 MB to build and install documentation)">
   <!ENTITY libassuan-time          "less than 0.1 SBU">
 ]>
Index: general/genlib/libxml2.xml
===================================================================
--- general/genlib/libxml2.xml	(revision f37810e50f80e0e10c65d746605a0a8783a16692)
+++ general/genlib/libxml2.xml	(revision 06eea232619791e969e9e473b4b48965a5582d81)
@@ -97,5 +97,5 @@
         <application>GNOME Doc Utils</application>) need the
         <application>Python</application> module installed to function properly
-        and some packages (such as MesaLib) will not build properly if the
+        and some packages will not build properly if the
         <application>Python</application> module is not available.
       </para>
Index: general/graphlib/librsvg.xml
===================================================================
--- general/graphlib/librsvg.xml	(revision f37810e50f80e0e10c65d746605a0a8783a16692)
+++ general/graphlib/librsvg.xml	(revision 06eea232619791e969e9e473b4b48965a5582d81)
@@ -7,8 +7,8 @@
   <!ENTITY librsvg-download-http "&gnome-download-http;/librsvg/2.40/librsvg-&librsvg-version;.tar.xz">
   <!ENTITY librsvg-download-ftp  "&gnome-download-ftp;/librsvg/2.40/librsvg-&librsvg-version;.tar.xz">
-  <!ENTITY librsvg-md5sum        "acdecdb9f08f3bf662a68bf7dafb8b82">
-  <!ENTITY librsvg-size          "496 KB">
-  <!ENTITY librsvg-buildsize     "11 MB (additional 1 MB for the tests)">
-  <!ENTITY librsvg-time          "0.2 SBU (additional 0.3 SBU for the tests)">
+  <!ENTITY librsvg-md5sum        "33d5c3811c915a5e29a219824249e265">
+  <!ENTITY librsvg-size          "500 KB">
+  <!ENTITY librsvg-buildsize     "11 MB">
+  <!ENTITY librsvg-time          "0.2 SBU">
 ]>
 
@@ -179,5 +179,5 @@
         <listitem>
           <para>
-            is used to covert SVG images into PNG, JPEG and ICO raster images.
+            is used to convert images into PNG, PDF, PS, SVG and other formats.
           </para>
           <indexterm zone="librsvg rsvg-convert">
Index: general/prog/python2.xml
===================================================================
--- general/prog/python2.xml	(revision f37810e50f80e0e10c65d746605a0a8783a16692)
+++ general/prog/python2.xml	(revision 06eea232619791e969e9e473b4b48965a5582d81)
@@ -256,6 +256,5 @@
           python2 (symlink), python2-config (symlink),
           python&python2-majorver;, python&python2-majorver;-config,
-          smtpd.py, and optionally if <application>Tk</application>
-          is installed, idle
+          smtpd.py, and idle
         </seg>
         <seg>
@@ -295,5 +294,7 @@
           <para>
             is a wrapper script that opens a <application>Python</application>
-            aware GUI editor.
+            aware GUI editor. For this script to run, you must have installed
+            <application>Tk</application> before Python so that the Tkinter
+            Python module is built.
           </para>
           <indexterm zone="python2 idle">
Index: general/prog/python3.xml
===================================================================
--- general/prog/python3.xml	(revision f37810e50f80e0e10c65d746605a0a8783a16692)
+++ general/prog/python3.xml	(revision 06eea232619791e969e9e473b4b48965a5582d81)
@@ -261,6 +261,5 @@
           pyvenv&python3-majorver;,
 
-          and optionally, if Tk is installed,
-          idle3 (symlink) and
+          idle3 (symlink), and
           idle&python3-majorver;
         </seg>
@@ -286,6 +285,8 @@
         <listitem>
           <para>
-            is a wrapper script that opens a
-            <application>Python</application> aware GUI editor.
+            is a wrapper script that opens a <application>Python</application>
+            aware GUI editor. For this script to run, you must have installed
+            <application>Tk</application> before Python so that the Tkinter
+            Python module is built.
           </para>
           <indexterm zone="python3 idle3">
Index: general/sysutils/colord-systemd.xml
===================================================================
--- general/sysutils/colord-systemd.xml	(revision f37810e50f80e0e10c65d746605a0a8783a16692)
+++ general/sysutils/colord-systemd.xml	(revision 06eea232619791e969e9e473b4b48965a5582d81)
@@ -8,7 +8,7 @@
            "http://www.freedesktop.org/software/colord/releases/colord-&colord-version;.tar.xz">
   <!ENTITY colord-download-ftp  " ">
-  <!ENTITY colord-md5sum        "452e02b3a7cc3ae5b4fc9bef304a6902">
+  <!ENTITY colord-md5sum        "a03f06f20a1c70cbf30fc8bd59b99678">
   <!ENTITY colord-size          "1.2 MB">
-  <!ENTITY colord-buildsize     "31 MB (additional 3 MB to rebuild and install the API documentation, and 2 MB for the tests)">
+  <!ENTITY colord-buildsize     "31 MB 31 MB (additional 4 MB to build and install the API documentation, and 4 MB for the tests)">
   <!ENTITY colord-time          "0.5 SBU (additional 0.1 SBU for the tests)">
 ]>
@@ -179,6 +179,9 @@
       href="../../xincludes/static-libraries.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
+    <para>
+      <option>--enable-gtk-doc</option>: Use this switch if
+      <application>GTK-Doc</application> is installed and you wish to
+      build and install the API documentation.
+    </para>
 
     <para>
@@ -196,11 +199,4 @@
       <application>Polkit</application> installed.
     </para>
-
-    <para><option>--libexecdir=/usr/lib/colord</option>: This option
-    creates a <filename class="directory">colord</filename> directory in
-    <filename class="directory">/usr/lib</filename> instead of putting the
-    program's private programs into <filename
-    class="directory">/usr/libexec</filename> in accordance with the old
-    version of the FHS used before LFS-7.5.</para>
 
   </sect2>
@@ -220,6 +216,5 @@
         </seg>
         <seg>
-          libcolordprivate.so, libcolord.so, libcolorhug.so, and several under
-          /usr/lib/colord-plugin and /usr/lib/colord-sensors
+          libcolord.so, libcolordprivate.so, and libcolorhug.so
         </seg>
         <seg>
Index: gnome-systemd/applications/totem.xml
===================================================================
--- gnome-systemd/applications/totem.xml	(revision f37810e50f80e0e10c65d746605a0a8783a16692)
+++ gnome-systemd/applications/totem.xml	(revision 06eea232619791e969e9e473b4b48965a5582d81)
@@ -9,8 +9,8 @@
   <!ENTITY totem-download-ftp  
            "&gnome-download-ftp;/totem/&gnome-minor;/totem-&totem-version;.tar.xz">
-  <!ENTITY totem-md5sum        "2b506bae9468331d1e5aec4fab231ad7">
+  <!ENTITY totem-md5sum        "939272a90d60c075b957a220c87bd680">
   <!ENTITY totem-size          "3.2 MB">
   <!ENTITY totem-buildsize     "68 MB">
-  <!ENTITY totem-time          "1.7 SBU">
+  <!ENTITY totem-time          "1.6 SBU">
 ]>
 
@@ -106,7 +106,6 @@
       <xref linkend="gtk-doc"/>,
       <ulink url="http://www.lirc.org">LIRC</ulink>,
-      <ulink url="http://pypi.python.org/pypi/pylint">pylint</ulink>,
-      <ulink url="http://launchpad.net/zeitgeist">Zeitgeist</ulink>, and
-      <xref linkend="xulrunner"/>
+      <ulink url="http://pypi.python.org/pypi/pylint">pylint</ulink>, and
+      <ulink url="http://launchpad.net/zeitgeist">Zeitgeist</ulink>
     </para>
 
Index: gnome.ent
===================================================================
--- gnome.ent	(revision f37810e50f80e0e10c65d746605a0a8783a16692)
+++ gnome.ent	(revision 06eea232619791e969e9e473b4b48965a5582d81)
@@ -108,5 +108,5 @@
 <!ENTITY vinagre-version              "3.12.2">
 <!ENTITY vino-version                 "3.12.0">
-<!ENTITY totem-version                "3.12.1">
+<!ENTITY totem-version                "3.12.2">
 
 <!ENTITY polkit-gnome-version         "0.105">
Index: gnome/applications/totem.xml
===================================================================
--- gnome/applications/totem.xml	(revision f37810e50f80e0e10c65d746605a0a8783a16692)
+++ gnome/applications/totem.xml	(revision 06eea232619791e969e9e473b4b48965a5582d81)
@@ -9,8 +9,8 @@
   <!ENTITY totem-download-ftp  
      "&gnome-download-ftp;/totem/&gnome-minor;/totem-&totem-version;.tar.xz">
-  <!ENTITY totem-md5sum        "2b506bae9468331d1e5aec4fab231ad7">
+  <!ENTITY totem-md5sum        "939272a90d60c075b957a220c87bd680">
   <!ENTITY totem-size          "3.2 MB">
   <!ENTITY totem-buildsize     "68 MB">
-  <!ENTITY totem-time          "1.7 SBU">
+  <!ENTITY totem-time          "1.6 SBU">
 ]>
 
@@ -107,8 +107,8 @@
       bootscript/systemd unit),
       <xref linkend="gtk-doc"/>,
+      <xref linkend="xulrunner"/>, 
       <ulink url="http://www.lirc.org">LIRC</ulink>,
-      <ulink url="http://pypi.python.org/pypi/pylint">pylint</ulink>,
-      <ulink url="http://launchpad.net/zeitgeist">zeitgeist</ulink>, and
-      <xref linkend="xulrunner"/>
+      <ulink url="http://pypi.python.org/pypi/pylint">pylint</ulink>, and
+      <ulink url="http://launchpad.net/zeitgeist">zeitgeist</ulink>,
     </para>
 
@@ -133,6 +133,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -181,5 +180,5 @@
         <seg>
           libtotem.so and several plugins under /usr/lib/mozilla/plugins/,
-          /usr/lib/totem/plugins/*/, and /usr/lib/nautilus/extensions-3.0/
+          and /usr/lib/nautilus/extensions-3.0/
         </seg>
         <seg>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision f37810e50f80e0e10c65d746605a0a8783a16692)
+++ introduction/welcome/changelog.xml	(revision 06eea232619791e969e9e473b4b48965a5582d81)
@@ -44,4 +44,41 @@
 
 -->
+    <listitem>
+      <para>August 19th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to totem-3.12.2. Fixes
+          <ulink url="&blfs-ticket-root;5398">#5398</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to colord-1.2.2. Fixes
+          <ulink url="&blfs-ticket-root;5397">#5397</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to librsvg-2.40.3. Fixes
+          <ulink url="&blfs-ticket-root;5396">#5396</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[igor] - Update to dhcp-4.3.1. Fixes
+          <ulink url="&blfs-ticket-root;5359">#5359</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>August 18th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to libassuan-2.1.2. Fixes
+          <ulink url="&blfs-ticket-root;5395">#5395</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to ffmpeg-2.3.3. Some fixes for
+          docummentation build. Thanks Bruce D. and Christopher G. for
+          reporting. One fix was reported by Christopher G. Fixes
+          <ulink url="&blfs-ticket-root;5394">#5394</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: multimedia/libdriv/grilo-plugins-systemd.xml
===================================================================
--- multimedia/libdriv/grilo-plugins-systemd.xml	(revision f37810e50f80e0e10c65d746605a0a8783a16692)
+++ multimedia/libdriv/grilo-plugins-systemd.xml	(revision 06eea232619791e969e9e473b4b48965a5582d81)
@@ -82,13 +82,13 @@
       <xref linkend="gmime"/> (Podcasts),
       <xref linkend="gnome-online-accounts"/> (Flickr),
-      <ulink url="https://download.gnome.org/sources/gupnp-av/">GuPNP-AV</ulink> (GUPnP),
       <xref linkend="json-glib"/> (TMDB),
-      <ulink url="https://www.flyn.org/projects/libdmapsharing/">libdmapsharing</ulink> (DMAP),
       <xref linkend="libgdata"/> (YouTube),
       <xref linkend="libmediaart"/> (local-art),
       <xref linkend="liboauth"/> (to configure Flickr personal accounts),
-      <ulink url="http://sourceforge.net/projects/quvi">libquvi (version 0.9)</ulink> (Youtube),
-      <xref linkend="lua"/> (Lua Factory), and
-      <xref linkend="tracker"/> (Tracker)
+      <xref linkend="lua"/> (Lua Factory),
+      <xref linkend="tracker"/> (Tracker),
+      <ulink url="&gnome-download-http;/gupnp-av/">GuPNP-AV</ulink> (GUPnP),
+      <ulink url="https://www.flyn.org/projects/libdmapsharing/">libdmapsharing</ulink> (DMAP) and
+      <ulink url="http://sourceforge.net/projects/quvi">libquvi (version 0.9)</ulink> (Youtube)
     </para>
 
Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision f37810e50f80e0e10c65d746605a0a8783a16692)
+++ multimedia/videoutils/ffmpeg.xml	(revision 06eea232619791e969e9e473b4b48965a5582d81)
@@ -7,8 +7,8 @@
   <!ENTITY ffmpeg-download-http "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.bz2">
   <!ENTITY ffmpeg-download-ftp  " ">
-  <!ENTITY ffmpeg-md5sum        "651e5e82360baba41e4d1e426b4897f6">
-  <!ENTITY ffmpeg-size          "7.1 MB">
-  <!ENTITY ffmpeg-buildsize     "119 MB (additional 764 MB for docs and 1813 MB to run the FATE tests)">
-  <!ENTITY ffmpeg-time          "3.4 SBU (additional 1.2 SBU for docs and 7.2 SBU to run the FATE tests, after sample files are downloaded)">
+  <!ENTITY ffmpeg-md5sum        "72361d3b8717b6db3ad2b9da8df7af5e">
+  <!ENTITY ffmpeg-size          "7.2 MB">
+  <!ENTITY ffmpeg-buildsize     "128 MB (additional 857 MB for docs and 1871 MB to run the FATE tests)">
+  <!ENTITY ffmpeg-time          "3.3 SBU (additional 0.9 SBU for docs and 4.5 SBU to run the FATE tests, after sample files are downloaded)">
 ]>
 
@@ -198,5 +198,8 @@
     </para>
 
-<screen><userinput>pushd doc &amp;&amp;
+<screen><userinput>sed -i '$s/$/\n\n@bye/' doc/{git-howto,nut,fate}.texi             &amp;&amp;
+sed -i '/machine:i386/ s/\\/@backslashchar{}/g' doc/platform.texi &amp;&amp;
+
+pushd doc &amp;&amp;
 for DOCNAME in `basename -s .html *.html`
 do
@@ -219,5 +222,5 @@
       installed and follow the instructions for the
       <ulink url="http://www.ffmpeg.org/fate.html">
-      FFmpeg Automated Testing Environment</ulink> (FATE). First, over 760 MB
+      FFmpeg Automated Testing Environment</ulink> (FATE). First, about 872 MB
       of sample files used to run FATE are downloaded with the command:
     </para>
@@ -265,7 +268,8 @@
     </para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/ffmpeg/api &amp;&amp;
-install -v -m644    doc/doxy/html/* \
-                    /usr/share/doc/ffmpeg/api</userinput></screen>
+<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/ffmpeg/api                       &amp;&amp;
+cp -vr doc/doxy/html/* /usr/share/doc/ffmpeg/api                    &amp;&amp;
+find /usr/share/doc/ffmpeg/api -type f -exec chmod -c 0644 "{}" ";" &amp;&amp;
+find /usr/share/doc/ffmpeg/api -type d -exec chmod -c 0755 "{}" ";"</userinput></screen>
 
   </sect2>
@@ -275,8 +279,18 @@
 
     <para>
-      <command>sed -i ...</command>: This command adds the
+      <command>sed -i ... configure</command>: This command adds the
       <application>ALSA</application> library to the
       <application>Flite</application> <envar>LDFLAGS</envar> variable and
       enables the discovery of <application>Flite</application>.
+    </para>
+
+    <para>
+      <command>sed -i ... texi</command>: Fix some .texi files for
+      documentation builds.
+    </para>
+
+    <para>
+      <command>find ... ";"</command>: Fix permissions of documentation files
+      and directories.
     </para>
 
Index: networking/connect/dhcp-systemd.xml
===================================================================
--- networking/connect/dhcp-systemd.xml	(revision f37810e50f80e0e10c65d746605a0a8783a16692)
+++ networking/connect/dhcp-systemd.xml	(revision 06eea232619791e969e9e473b4b48965a5582d81)
@@ -7,8 +7,8 @@
   <!ENTITY dhcp-download-http " ">
   <!ENTITY dhcp-download-ftp  "ftp://ftp.isc.org/isc/dhcp/&dhcp-version;/dhcp-&dhcp-version;.tar.gz">
-  <!ENTITY dhcp-md5sum        "1020d77e1a4c1f01b76279caff9beb80">
+  <!ENTITY dhcp-md5sum        "b3a42ece3c7f2cd2e74a3e12ca881d20">
   <!ENTITY dhcp-size          "8.6 MB">
-  <!ENTITY dhcp-buildsize     "208 MB">
-  <!ENTITY dhcp-time          "0.8 SBU">
+  <!ENTITY dhcp-buildsize     "109 MB">
+  <!ENTITY dhcp-time          "0.4 SBU">
 ]>
 
@@ -87,5 +87,5 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/dhcp-&dhcp-version;-client_script-2.patch"/>
+          <ulink url="&patch-root;/dhcp-&dhcp-version;-client_script-1.patch"/>
         </para>
       </listitem>
@@ -143,5 +143,5 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../dhcp-&dhcp-version;-client_script-2.patch &amp;&amp;
+<screen><userinput>patch -Np1 -i ../dhcp-&dhcp-version;-client_script-1.patch &amp;&amp;
 CFLAGS="-D_PATH_DHCLIENT_SCRIPT='\"/sbin/dhclient-script\"'         \
         -D_PATH_DHCPD_CONF='\"/etc/dhcp/dhcpd.conf\"'               \
Index: packages.ent
===================================================================
--- packages.ent	(revision f37810e50f80e0e10c65d746605a0a8783a16692)
+++ packages.ent	(revision 06eea232619791e969e9e473b4b48965a5582d81)
@@ -100,5 +100,5 @@
 <!ENTITY keyutils-version             "1.5.9">
 <!ENTITY libarchive-version           "3.1.2">
-<!ENTITY libassuan-version            "2.1.1">
+<!ENTITY libassuan-version            "2.1.2">
 <!ENTITY libatasmart-version          "0.19">
 <!ENTITY libatomic_ops-version        "7.4.2">
@@ -165,5 +165,5 @@
 <!ENTITY libmng-version               "2.0.2">
 <!ENTITY libpng-version               "1.6.12">
-<!ENTITY librsvg-version              "2.40.2">   <!-- Normally even minors
+<!ENTITY librsvg-version              "2.40.3">   <!-- Normally even minors
                                                        Required version in order to use
                                                        svg pixbuf loader. -->
@@ -206,5 +206,5 @@
 <!ENTITY autofs-version               "5.1.0">
 <!ENTITY bluez-version                "5.22">
-<!ENTITY colord-version               "1.2.1">    <!-- Even minors only -->
+<!ENTITY colord-version               "1.2.2">    <!-- Even minors only -->
 <!ENTITY cpio-version                 "2.11">
 <!ENTITY dbus-version                 "1.8.6">   <!-- Even minors only -->
@@ -307,5 +307,5 @@
 <!ENTITY ppp-version                  "2.4.5">
 <!ENTITY dhcpcd-version               "6.4.3">
-<!ENTITY dhcp-version                 "4.3.0">
+<!ENTITY dhcp-version                 "4.3.1">
 
 <!-- Chapter 15 -->
@@ -657,5 +657,5 @@
 
 <!-- Chapter 40 -->
-<!ENTITY ffmpeg-version               "2.3.2">
+<!ENTITY ffmpeg-version               "2.3.3">
 <!ENTITY mplayer-version              "1.1.1">
 <!ENTITY xine-ui-version              "0.99.8">
Index: x/installing/mesalib-systemd.xml
===================================================================
--- x/installing/mesalib-systemd.xml	(revision f37810e50f80e0e10c65d746605a0a8783a16692)
+++ x/installing/mesalib-systemd.xml	(revision 06eea232619791e969e9e473b4b48965a5582d81)
@@ -73,5 +73,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Patch</bridgehead>
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -88,6 +88,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="xorg7-lib"/> and
-      <xref linkend="libdrm"/>
+      <xref linkend="libdrm"/>,
+      <xref linkend="python2"/> and
+      <xref linkend="xorg7-lib"/>
     </para>
 
@@ -119,5 +120,5 @@
         Please note that <application>elfutils</application> and
         <application>LLVM</application> are <emphasis>required</emphasis>
-        for Radeon 3D drivers. For an explanation of gallium please see
+        for Radeon 3D drivers. For an explanation of Gallium please see
         <ulink url="https://en.wikipedia.org/wiki/Gallium3D"></ulink>.
       </para>
Index: x/installing/x7driver-ati.xml
===================================================================
--- x/installing/x7driver-ati.xml	(revision f37810e50f80e0e10c65d746605a0a8783a16692)
+++ x/installing/x7driver-ati.xml	(revision 06eea232619791e969e9e473b4b48965a5582d81)
@@ -90,16 +90,12 @@
       </para>
 
-      <!-- <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="Recommended">
-        <xref linkend="glamor-egl"/>
-      </para>
-
       <note>
         <para>
-          This is <emphasis>required for "Southern Islands" GPUs</emphasis>
-          but optional for R300 to R700, Evergreen and "Northern Islands"
-          GPUs - see the link under "Glamor Acceleration" below.
+          Glamor is <emphasis>required for "Southern Islands" and later
+          GPUs</emphasis> but optional for R300 to R700, Evergreen and
+          "Northern Islands" GPUs - see the link under "Glamor
+          Acceleration" below.
         </para>
-      </note> -->
+      </note>
 
       <para condition="html" role="usernotes">
Index: x/installing/xorg-server-systemd.xml
===================================================================
--- x/installing/xorg-server-systemd.xml	(revision f37810e50f80e0e10c65d746605a0a8783a16692)
+++ x/installing/xorg-server-systemd.xml	(revision 06eea232619791e969e9e473b4b48965a5582d81)
@@ -73,4 +73,10 @@
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Recommended patch:
+          <ulink url="&patch-root;/xorg-server-&xorg-server-version;-upstream_glamor_fix-1.patch"/>
+        </para>
+      </listitem>
       <listitem>
         <para>
@@ -95,5 +101,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="libepoxy"/> (for Glamor) and
+      <xref linkend="libepoxy"/> (for Glamor),
       <xref linkend="wayland"/> (both for <command>Xwayland</command>) and
       <xref linkend="systemd"/> (for Logind)
@@ -119,4 +125,11 @@
 
     <para>
+      If you are going to build Glamor, apply the recommended patch by running
+      the following command:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-upstream_glamor_fix-1.patch</userinput></screen>
+
+    <para>
       If you have downloaded the optional patch, apply it by running
       the following command:
@@ -159,6 +172,10 @@
 
     <para>
-      <parameter>--enable-glamor</parameter>: This switch enables building of the
-      Glamor DIX module which is required by some drivers.
+      <parameter>--enable-glamor</parameter>: This switch enables building
+      of the Glamor DIX module which is required by some drivers and
+      <command>Xwayland</command>. Remove it if you don't want to install
+      <application>libepoxy</application> and are not going to need
+      <command>Xwayland</command> or you don't have any hardware that
+      requires Glamor (Radeon "Southern Islands" and later GPUs).
     </para>
 
@@ -166,11 +183,4 @@
       <parameter>--enable-suid-wrapper</parameter>: This switch enables building of
       the suid-root wrapper for legacy driver support on rootless xserver systems.
-    </para>
-
-    <para>
-      <option>--enable-install-setuid</option>: Use this switch if you have not
-      reinstalled <application>systemd</application> with Logind support and
-      wish to run the <application>Xorg Server</application> as the
-      <systemitem class="username">root</systemitem> user.
     </para>
 
