Index: general.ent
===================================================================
--- general.ent	(revision cbd8ed80f258a9914879f95744b109614069287b)
+++ general.ent	(revision f885719712a48b2a6e8ee426281bb026234c3e19)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "23">                   <!-- Always 2 digits -->
+<!ENTITY day          "24">                   <!-- Always 2 digits -->
 <!ENTITY month        "07">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "July 23rd &year;">
+<!ENTITY releasedate  "July 24th &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 cbd8ed80f258a9914879f95744b109614069287b)
+++ introduction/welcome/changelog.xml	(revision f885719712a48b2a6e8ee426281bb026234c3e19)
@@ -44,4 +44,18 @@
 
 -->
+    <listitem>
+      <para>July 24th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to xorg-server-1.18.4. Fixes
+          <ulink url="&blfs-ticket-root;8094">#8094</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libinput-1.4.0. Fixes
+          <ulink url="&blfs-ticket-root;8085">#8085</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>July 23rd, 2016</para>
Index: packages.ent
===================================================================
--- packages.ent	(revision cbd8ed80f258a9914879f95744b109614069287b)
+++ packages.ent	(revision f885719712a48b2a6e8ee426281bb026234c3e19)
@@ -492,5 +492,5 @@
 <!ENTITY xcb-util-wm-version          "0.4.1">
 <!ENTITY xcb-util-cursor-version      "0.1.3">
-<!ENTITY xorg-server-version          "1.18.3">
+<!ENTITY xorg-server-version          "1.18.4">
 <!ENTITY twm-version                  "1.0.9">
 <!ENTITY xterm-version                "325">
Index: postlfs/config/firmware.xml
===================================================================
--- postlfs/config/firmware.xml	(revision cbd8ed80f258a9914879f95744b109614069287b)
+++ postlfs/config/firmware.xml	(revision f885719712a48b2a6e8ee426281bb026234c3e19)
@@ -92,5 +92,5 @@
     be updated by upgrading to a newer version of those. On linux, you can also
     load the microcode from the kernel if you are using an AMD family 10h or
-    later processor (first introduced late 2007), or an intel processor from
+    later processor (first introduced late 2007), or an Intel processor from
     1998 and later (Pentium4, Core, etc), if updated microcode has been
     released. These updates only last until the machine is powered off, so they
@@ -103,5 +103,5 @@
     <ulink url="https://lwn.net/Articles/530346/">x86/microcode: Early load
     microcode </ulink> on LWN.)  Indeed, it is needed to work around one
-    particular erratum in early intel Haswell processors which had TSX enabled.
+    particular erratum in early Intel Haswell processors which had TSX enabled.
     (See <ulink
     url="http://www.anandtech.com/show/8376/intel-disables-tsx-instructions-erratum-found-in-haswell-haswelleep-broadwellyi/">
@@ -131,5 +131,5 @@
          <ulink url='http://fedorahosted.org/released/microcode_ctl/'/></para>
 
-      <para>For intel CPUs an extra package, microcode_ctl, is required. The
+      <para>For Intel CPUs an extra package, microcode_ctl, is required. The
       package chosen is the version hosted at fedora &mdash; there is an
       alternative version at github from the same packager, but that still
@@ -138,7 +138,7 @@
 
       <para>Download the latest version from the link above; when last checked
-      this was 2.1-8 and is updated when intel releases new microcode.</para>
-
-      <para>This package reformats the microcode supplied by intel into a
+      this was 2.1-8 and is updated when Intel releases new microcode.</para>
+
+      <para>This package reformats the microcode supplied by Intel into a
       format which the kernel can apply. The program
       <userinput>intel-microcode2ucode</userinput> is built and invoked by the
@@ -170,6 +170,6 @@
 cp -v &lt;XX-YY-ZZ&gt; /lib/firmware/intel-ucode</userinput></screen>
 
-      <para>Now that the intel microcode has been prepared, use the following
-      options when you configure the kernel to try late loading of the intel
+      <para>Now that the Intel microcode has been prepared, use the following
+      options when you configure the kernel to try late loading of the Intel
       microcode:</para>
 
Index: x/installing/libinput.xml
===================================================================
--- x/installing/libinput.xml	(revision cbd8ed80f258a9914879f95744b109614069287b)
+++ x/installing/libinput.xml	(revision f885719712a48b2a6e8ee426281bb026234c3e19)
@@ -5,12 +5,12 @@
   %general-entities;
 
-  <!ENTITY libinput-version "1.3.3">
+  <!ENTITY libinput-version "1.4.0">
 
   <!ENTITY libinput-download-http "http://www.freedesktop.org/software/libinput/libinput-&libinput-version;.tar.xz">
   <!ENTITY libinput-download-ftp  " ">
-  <!ENTITY libinput-md5sum        "51bfd53ab545cd72eb9a3e81d8e6b300">
-  <!ENTITY libinput-size          "864 KB">
-  <!ENTITY libinput-buildsize     "32 MB (add 10 MB for tests)">
-  <!ENTITY libinput-time          "0.3 SBU (add 13 minutes for tests, only partially CPU dependent)">
+  <!ENTITY libinput-md5sum        "643d21c63d5dcc2d73de3d573e9f7538">
+  <!ENTITY libinput-size          "884 KB">
+  <!ENTITY libinput-buildsize     "17 MB (add 10 MB for tests)">
+  <!ENTITY libinput-time          "0.1 SBU (add 37 minutes for tests, not CPU dependent)">
 ]>
 
@@ -85,5 +85,5 @@
     <para role="optional">
       <xref linkend="check"/> and
-      <xref linkend="valgrind"/> (to build the tests),
+      <xref linkend="valgrind"/> (to run the tests),
       <xref linkend="doxygen"/> and
       <xref linkend="graphviz"/> (to build the documentation)
@@ -112,7 +112,24 @@
 make</userinput></screen>
 
-    <para>
-      Running the testsuite for this package can be dangerous, as
-      it creates a number of dummy input devices on the currently
+    <note><para>
+      To run the tests for this package, valgrind requires a
+      version of the /lib/ld-2.23.so library with debugging symbols
+      present.  Normally in LFS these debugging symbols are 
+      stripped at the end of Chapter 6. To get this library, 
+      glibc must be rebuilt with the current glibc version using
+      the same compiler that was used to build LFS.  The ld-2.23.so
+      can then be renamed to ld-2.23.so.dbg and copied to /lib.
+      Then a symlink needs to be changed:</para>
+
+    <screen><userinput>ln -sfv ld-2.23.so.dbg /lib/ld-linux-x86-64.so.2</userinput></screen>
+
+    <para>Adjust the above instruction as needed for a 32-bit system
+    or for a different version of glibc</para>
+
+    </note>
+
+    <para>
+      Running the testsuite for this package can cause problems. 
+      It creates a number of dummy input devices on the currently
       running system that can lead to crashing a local X server or
       a desktop environment. If you understand the risks and have
Index: x/installing/xorg-server.xml
===================================================================
--- x/installing/xorg-server.xml	(revision cbd8ed80f258a9914879f95744b109614069287b)
+++ x/installing/xorg-server.xml	(revision f885719712a48b2a6e8ee426281bb026234c3e19)
@@ -7,8 +7,8 @@
   <!ENTITY xorg-server-download-http "&xorg-download-http;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
   <!ENTITY xorg-server-download-ftp  "&xorg-download-ftp;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
-  <!ENTITY xorg-server-md5sum        "043d720bf2472a65bb8f0daa97f83dfa">
-  <!ENTITY xorg-server-size          "5.6 MB">
-  <!ENTITY xorg-server-buildsize     "544 MB (with tests)">
-  <!ENTITY xorg-server-time          "1.8 SBU (with tests)">
+  <!ENTITY xorg-server-md5sum        "d4842dfe3bd9a9d062f2fa1df9104a46">
+  <!ENTITY xorg-server-size          "5.7 MB">
+  <!ENTITY xorg-server-buildsize     "705 MB (with tests)">
+  <!ENTITY xorg-server-time          "2.2 SBU (with tests)">
 ]>
 
@@ -79,11 +79,4 @@
         </para>
       </listitem>
-<!--  Seems to have been included in version 1.18.2
-      <listitem>
-        <para>
-          Recommended patch (required by <xref linkend="wayland"/>):
-          <ulink url="&patch-root;/xorg-server-&xorg-server-version;-wayland_190-1.patch"/>
-        </para>
-      </listitem>-->
     </itemizedlist>
 
@@ -143,11 +136,4 @@
 <screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-add_prime_support-1.patch</userinput></screen>
 
- <!--   <para>
-      If you have downloaded the recommended patch, apply it by running the
-      following command:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-wayland_190-1.patch</userinput></screen>
--->
     <para>
       Install the server by running the following commands:
@@ -169,5 +155,7 @@
 
     <para>
-      To test the results, issue: <command>make check</command>.
+      To test the results, issue: <command>make check</command>. You
+      will need to run <command>ldconfig</command> as the <systemitem
+      class="username">root</systemitem> user first or some tests may fail.
     </para>
 
