Index: x/installing/libevdev.xml
===================================================================
--- x/installing/libevdev.xml	(revision a78d851025d76343c2c0cfc38806438cf25037e5)
+++ x/installing/libevdev.xml	(revision f97d5f6072ef1eebe7fe263d9c8fa6c6195836b3)
@@ -15,6 +15,6 @@
 ]>
 
-  <!-- Begin Xorg Libevdev Driver -->
-  <sect2 id="libevdev" xreflabel="Libevdev-&libevdev-version;">
+  <!-- Begin Xorg libevdev Driver -->
+  <sect2 id="libevdev" xreflabel="libevdev-&libevdev-version;">
 
   <sect2info>
@@ -23,5 +23,5 @@
   </sect2info>
 
-    <title>Libevdev &libevdev-version;</title>
+    <title>libevdev &libevdev-version;</title>
 
     <indexterm zone="libevdev">
@@ -30,8 +30,8 @@
 
     <sect3 role="package">
-      <title>Introduction to Libevdev</title>
-
-      <para>
-        The <application>Libevdev</application> package contains common
+      <title>Introduction to libevdev</title>
+
+      <para>
+        The <application>libevdev</application> package contains common
         functions for Xorg input drivers.
       </para>
@@ -73,5 +73,5 @@
       </itemizedlist>
 
-      <bridgehead renderas="sect4">Libevdev Dependencies</bridgehead>
+      <bridgehead renderas="sect4">libevdev Dependencies</bridgehead>
 
       <bridgehead renderas="sect5">Required</bridgehead>
@@ -113,8 +113,8 @@
 
     <sect3 role="installation">
-      <title>Installation of Libevdev</title>
-
-      <para>
-        Install <application>Libevdev</application> by running the following
+      <title>Installation of libevdev</title>
+
+      <para>
+        Install <application>libevdev</application> by running the following
         commands:
       </para>
Index: x/installing/libinput.xml
===================================================================
--- x/installing/libinput.xml	(revision f97d5f6072ef1eebe7fe263d9c8fa6c6195836b3)
+++ x/installing/libinput.xml	(revision f97d5f6072ef1eebe7fe263d9c8fa6c6195836b3)
@@ -0,0 +1,224 @@
+<?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 libinput-version "1.1.0">
+
+  <!ENTITY libinput-download-http "http://www.freedesktop.org/software/libinput/libinput-&libinput-version;.tar.xz">
+  <!ENTITY libinput-download-ftp  " ">
+  <!ENTITY libinput-md5sum        "3610c80555f4cb13fe61d4c04511e060">
+  <!ENTITY libinput-size          "784 KB">
+  <!ENTITY libinput-buildsize     "30 MB">
+  <!ENTITY libinput-time          "0.2 SBU">
+]>
+
+<sect2 id="libinput" xreflabel="libinput-&libinput-version;">
+  <?dbhtml filename="libinput.html"?>
+
+  <sect2info>
+    <othername>$LastChangedBy: renodr $</othername>
+    <date>$Date: 2015-09-14 17:42:53 -0500 (Mon, 14 Sep 2015) $</date>
+  </sect2info>
+
+  <title>libinput-&libinput-version;</title>
+
+  <indexterm zone="libinput">
+    <primary sortas="a-libinput">libinput</primary>
+  </indexterm>
+
+  <sect3 role="package">
+    <title>Introduction to libinput</title>
+
+    <para>
+      <application>libinput</application> is a library that handles
+      input devices for display servers and other applications that
+      need to directly deal with input devices.  It is currently only 
+      needed for <xref linkend="plasma5-build"/>.
+    </para>
+
+    &lfs78_checked;
+
+    <bridgehead renderas="sect4">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libinput-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libinput-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libinput-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libinput-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libinput-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libinput-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect4">libinput Dependencies</bridgehead>
+
+    <bridgehead renderas="sect5">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libevdev"/> and
+      <xref linkend="mtdev"/>
+    </para>
+
+    <bridgehead renderas="sect5">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="check"/> and
+      <xref linkend="valgrind"/> (to build the tests),
+      <xref linkend="doxygen"/> and
+      <xref linkend="graphviz"/> (to build the documentation)
+      <xref linkend="gtk3"/> (to build the GUI event viewer) and
+      <ulink url="http://www.nongnu.org/libunwind/">libunwind</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libinput"/>
+    </para>
+  </sect3>
+
+  <sect3 role="installation">
+    <title>Installation of libinput</title>
+
+    <para>
+      Install <application>libinput</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr    \
+            --disable-static \
+            --with-udev-dir=/lib/udev &amp;&amp;
+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
+      running system that can lead to crashing a local X server or
+      a desktop environment. If you understand the risks and have
+      the optional <xref linkend="check"/> and
+      <xref linkend="valgrind"/> packages installed, the regression
+      tests can be run as the <systemitem
+      class="username">root</systemitem> user with
+      <userinput>make check</userinput>. Note that depending on
+      the system configuration and hardware, some tests may fail.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      If <xref linkend="doxygen"/> and <xref linkend="graphviz"/> were
+      present during the build, you can install the generated documentation
+      by running the following commands as the <systemitem
+      class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -v -dm755 /usr/share/doc/libinput-&libinput-version; &amp;&amp;
+cp -rv doc/html/* /usr/share/doc/libinput-&libinput-version;</userinput></screen>
+
+  </sect3>
+
+  <sect3 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <para>
+      <parameter>--with-udev-dir=/lib/udev</parameter>: This switch
+      specifies where UDev rules and hwdb files will be installed.
+    </para>
+
+  </sect3>
+
+  <sect3 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          libinput-debug-events and libinput-list-devices
+        </seg>
+        <seg>
+          libinput.so
+        </seg>
+        <seg>
+          /usr/share/doc/libinput-&libinput-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libinput-debug-events">
+        <term><command>libinput-debug-events</command></term>
+        <listitem>
+          <para>
+            is a debug helper for <application>libinput</application>.
+          </para>
+          <indexterm zone="libinput libinput-debug-events">
+            <primary sortas="b-libinput-debug-events">libinput-debug-events</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libinput-list-devices">
+        <term><command>libinput-list-devices</command></term>
+        <listitem>
+          <para>
+            lists local devices as recognized by
+            <application>libinput</application>.
+          </para>
+          <indexterm zone="libinput libinput-list-devices">
+            <primary sortas="b-libinput-list-devices">libinput-list-devices</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libinput-lib">
+        <term><filename class="libraryfile">libinput.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions for handling input devices.
+          </para>
+          <indexterm zone="libinput libinput-lib">
+            <primary sortas="c-libinput">libinput.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect3>
+
+</sect2>
Index: x/installing/mesa.xml
===================================================================
--- x/installing/mesa.xml	(revision a78d851025d76343c2c0cfc38806438cf25037e5)
+++ x/installing/mesa.xml	(revision f97d5f6072ef1eebe7fe263d9c8fa6c6195836b3)
@@ -105,11 +105,11 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="wayland"/> (required for <xref linkend='plasma5-build'/>),
       <ulink url="ftp://ftp.freedesktop.org/pub/mesa/demos/">mesa-demos</ulink>
       (provides more than 300 extra demos to test
       <application>Mesa</application>; this includes the same programs
-      added by the patch above),
+      added by the patch above), and
       <ulink url="http://omxil.sourceforge.net/">Bellagio OpenMAX Integration
-      Layer</ulink> (for mobile platforms) and
-      <ulink url="http://wayland.freedesktop.org/">Wayland</ulink>
+      Layer</ulink> (for mobile platforms) 
     </para>
 
@@ -147,4 +147,9 @@
       commands:
     </para>
+
+    <note>
+      <para>Add wayland to the <option>--with-egl-platforms</option> option
+      below if you plan on building <xref linkend='plasma5-build'/>.</para>
+    </note>
 
 <screen><userinput>GLL_DRV="nouveau,r300,r600,radeonsi,svga,swrast" &amp;&amp;
Index: x/installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision a78d851025d76343c2c0cfc38806438cf25037e5)
+++ x/installing/x7driver.xml	(revision f97d5f6072ef1eebe7fe263d9c8fa6c6195836b3)
@@ -67,4 +67,9 @@
           <para>
             <xref linkend="libevdev"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <xref linkend="libinput"/>
           </para>
         </listitem>
@@ -150,4 +155,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="libinput.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="x7driver-evdev.xml"/>
 
