Index: general.ent
===================================================================
--- general.ent	(revision e4192e55dc886bcb4c244f01ae5a5a3cc7a78b2b)
+++ general.ent	(revision f97d5f6072ef1eebe7fe263d9c8fa6c6195836b3)
@@ -157,3 +157,3 @@
 <!ENTITY kf5apps-download-ftp  "ftp://ftp.kde.org/pub/kde/stable/&kf5apps-version;/src">
 
-<!ENTITY plasma5-version       "5.4.1">
+<!ENTITY plasma5-version       "5.4.2">
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision e4192e55dc886bcb4c244f01ae5a5a3cc7a78b2b)
+++ general/genlib/genlib.xml	(revision f97d5f6072ef1eebe7fe263d9c8fa6c6195836b3)
@@ -107,4 +107,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qjson.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="talloc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wayland.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xapian.xml"/>
Index: general/genlib/wayland.xml
===================================================================
--- general/genlib/wayland.xml	(revision f97d5f6072ef1eebe7fe263d9c8fa6c6195836b3)
+++ general/genlib/wayland.xml	(revision f97d5f6072ef1eebe7fe263d9c8fa6c6195836b3)
@@ -0,0 +1,217 @@
+<?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 wayland-download-http "http://wayland.freedesktop.org/releases/wayland-&wayland-version;.tar.xz">
+  <!ENTITY wayland-download-ftp  " ">
+  <!ENTITY wayland-md5sum        "5e141b3f2a7005d6c89d6f233c87c317">
+  <!ENTITY wayland-size          "344 KB">
+  <!ENTITY wayland-buildsize     "10.1 MB">
+  <!ENTITY wayland-time          "0.1 SBU">
+]>
+
+<sect1 id="wayland" xreflabel="Wayland-&wayland-version;">
+  <?dbhtml filename="wayland.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: renodr $</othername>
+    <date>$Date: 2015-07-31 23:26:22 -0500 (Fri, 31 Jul 2015) $</date>
+  </sect1info>
+
+  <title>Wayland-&wayland-version;</title>
+
+  <indexterm zone="wayland">
+    <primary sortas="a-Wayland">Wayland</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Wayland</title>
+
+    <para>
+      <application>Wayland</application> is a project to define a protocol
+      for a compositor to talk to its clients as well as a library
+      implementation of the protocol.
+    </para>
+
+    &lfs78_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&wayland-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&wayland-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &wayland-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &wayland-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &wayland-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &wayland-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Wayland Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libffi"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/>,
+      <xref linkend="graphviz"/> and
+      <xref linkend="xmlto"/> (to build the API documentation) and
+      <xref linkend="DocBook"/>,
+      <xref linkend="docbook-xsl"/> and
+      <xref linkend="libxslt"/> (to build the manual pages)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/wayland"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Wayland</title>
+
+    <para>
+      Install <application>Wayland</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr    \
+            --disable-static \
+            --disable-documentation &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>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <para>
+      <parameter>--disable-documentation</parameter>: This switch is used to
+      disable building of the API documentation. Remove it if you have
+      installed optional dependencies.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          wayland-scanner
+        </seg>
+        <seg>
+          libwayland-client.so, libwayland-cursor.so, and libwayland-server.so
+        </seg>
+        <seg>
+          /usr/share/wayland
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="wayland-scanner">
+        <term><command>wayland-scanner</command></term>
+        <listitem>
+          <para>
+            is a tool to generate proxy methods in wayland-client-protocol.h 
+            and wayland-server-protocol.h
+          </para>
+          <indexterm zone="wayland wayland-scanner">
+            <primary sortas="b-wayland-scanner">wayland-scanner</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libwayland-client">
+        <term><filename class="libraryfile">libwayland-client.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions for writing <application>Wayland</application>
+            applications.
+          </para>
+          <indexterm zone="wayland libwayland-client">
+            <primary sortas="c-libwayland-client">libwayland-client.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libwayland-cursor">
+        <term><filename class="libraryfile">libwayland-cursor.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions for managing cursors in <application>Wayland</application>
+            applications.
+          </para>
+          <indexterm zone="wayland libwayland-cursor">
+            <primary sortas="c-libwayland-cursor">libwayland-cursor.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libwayland-server">
+        <term><filename class="libraryfile">libwayland-server.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions for writing <application>Wayland</application>
+            compositors.
+          </para>
+          <indexterm zone="wayland libwayland-server">
+            <primary sortas="c-libwayland-server">libwayland-server.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision e4192e55dc886bcb4c244f01ae5a5a3cc7a78b2b)
+++ introduction/welcome/changelog.xml	(revision f97d5f6072ef1eebe7fe263d9c8fa6c6195836b3)
@@ -49,4 +49,9 @@
       <itemizedlist>
         <listitem>
+          <para>[fernando] - Add libinput, wayland, and libpwquality
+          for KDE Plasma5. Add preliminary Plasma5 instructions.  
+          Packages build, but the desktop does not yet run properly.</para>
+        </listitem>
+        <listitem>
           <para>[fernando] - Update to GNOME-3.18.1 - end. Fixes
           <ulink url="&blfs-ticket-root;6950">#6950</ulink>.</para>
Index: kde/plasma5/plasma-all.xml
===================================================================
--- kde/plasma5/plasma-all.xml	(revision e4192e55dc886bcb4c244f01ae5a5a3cc7a78b2b)
+++ kde/plasma5/plasma-all.xml	(revision f97d5f6072ef1eebe7fe263d9c8fa6c6195836b3)
@@ -30,5 +30,5 @@
   5 and QML derived from the monolithic KDE 4 desktop. They implement the KDE
   Display Environment (Plasma 5).</para>
-
+<!--
   <warning>
   
@@ -45,9 +45,9 @@
 
   </warning>
-
+-->
   <!--&lfs78_checked;-->
 
   <para>The instructions below build all of the Plasma 5 packages in one
-  step by using a bash script.  </para>
+  step by using a bash script.</para>
 
   <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -77,5 +77,8 @@
   <bridgehead renderas="sect4">Required</bridgehead>
   <para role="required">
-    <xref linkend="kf5-frameworks"/>
+    <xref linkend="kf5-frameworks"/>,
+    <xref linkend="libinput"/>, 
+    <xref linkend="libpwquality"/>, and
+    <xref linkend="mesa"/> built with <xref linkend="wayland"/>
   </para>
 
@@ -167,29 +170,42 @@
 
 <screen><userinput>cat &gt; plasma-&kf5-version;.md5 &lt;&lt; "EOF"
-<literal>cfff87d002b42b2487b522f94f157cb7  kwayland-5.4.1.tar.xz  
-bc8fd24c6ecd0948fc5adb3bda096f88  libkscreen-5.4.1.tar.xz
-c48b9030d7f5e86dc1f07091c3695758  libksysguard-5.4.1.tar.xz
-bd5a8def665759beab8170acd80ca53f  breeze-5.4.1.tar.xz
-91e85616bd899d2a610311b2ca1de622  kwin-5.4.1.tar.xz
-a56031b9600712eabcc0f6baeb8a2947  oxygen-5.4.1.tar.xz
-88522f2478fdff511e02102861dab620  oxygen-fonts-5.4.1.tar.xz
-99df60a8b2cc2b5c0f924a7c36cd9ad3  khelpcenter-5.4.1.tar.xz
-2aab5a329f2b4b196cd3e130bdf00bc6  kinfocenter-5.4.1.tar.xz
-68a6ffc478a63002cb183e64d1630d80  ksysguard-5.4.1.tar.xz
-2701f56228b6b45155b35a98a4a25df7  systemsettings-5.4.1.tar.xz
-0675ac84f739218cd1a17cfdc3d91e22  plasma-workspace-5.4.1.tar.xz
-33eb66bcec1c7f27b1a6a7629042de8e  bluedevil-5.4.1.tar.xz
-56a3a65f21fe1b78c409129dfdc48d9e  khotkeys-5.4.1.tar.xz
-5533875aea1883ce0d59cd72f1b05c24  kmenuedit-5.4.1.tar.xz
-2d656cd96b0910129890973c4ee01d01  kscreen-5.4.1.tar.xz
-6064bd41f2a7cdbe97a5be84e1a87fe3  kwrited-5.4.1.tar.xz
-030248d066c81093a954de64e51d31bf  milou-5.4.1.tar.xz
-528b5d70f64450a7d6e31f55dde2b155  plasma-nm-5.4.1.tar.xz
-ff82dd9fdbaaf96a25f6a23f96bce5f7  plasma-workspace-wallpapers-5.4.1.tar.xz
-0e27d8c01b108aa709a130466bc56a9a  polkit-kde-agent-1-5.4.1.tar.xz
-cb6b2663a3fdac63561b87a340aa91df  powerdevil-5.4.1.tar.xz
-823180ad53fafca7a6be56ab3f9ec2df  plasma-desktop-5.4.1.tar.xz
-d91c7633eca6bad228003a168d6789b1  kdeplasma-addons-5.4.1.tar.xz
-161710cb26d5fb123be4062656124934  kwayland-integration-5.4.1.tar.xz</literal>
+<literal>
+bb94a0d6f06583456b8f0a2eae07edd6  kde-cli-tools-5.4.2.tar.xz
+67683fc1ae1fdf014f567780502b574a  kdecoration-5.4.2.tar.xz
+c0c0eef0f2bfb93a81e4e701d7557eb9  kwayland-5.4.2.tar.xz
+5b3c52fbf0172dfcf749cde12ebb48f3  libkscreen-5.4.2.tar.xz
+c770bd91e3947373c00938e2d85628d9  libksysguard-5.4.2.tar.xz
+0e1d48eba3d0261023954b46fe7af36e  breeze-5.4.2.tar.xz
+c60184edbd89bfcf1ee1c03aefd741f8  kwin-5.4.2.tar.xz
+55eeb736365e902e957509a43884efd9  oxygen-5.4.2.tar.xz
+25bc526b21e9a0472e94a73b5f2d7d83  oxygen-fonts-5.4.2.tar.xz
+770b8c69df2c550ab66f0c316c3bf850  khelpcenter-5.4.2.tar.xz
+6714e90d548f37ec32d2cc166c68149c  kinfocenter-5.4.2.tar.xz
+7551c199c5caffda59363757bbc57243  ksysguard-5.4.2.tar.xz
+9d7cfdee2d138983f4267ba1e6a69be6  systemsettings-5.4.2.tar.xz
+a4fe835089c213c52f1407715163bf80  plasma-workspace-5.4.2.tar.xz
+bc10f321f5ea2a605be29d8cba6b9bc5  bluedevil-5.4.2.tar.xz
+530e74504d38cfd6783421c017c56f55  khotkeys-5.4.2.tar.xz
+bfaf172def24ea772dfc58c798b68938  kmenuedit-5.4.2.tar.xz
+9b0b4e2268d87cc7699e1e74e6faa8c3  kscreen-5.4.2.tar.xz
+171c439473a4ab9cdbbed6732a70801b  kwrited-5.4.2.tar.xz
+2298a15ef7957322b84829166824628c  milou-5.4.2.tar.xz
+35c599c728739cded5596d4821b5a53f  plasma-nm-5.4.2.tar.xz
+d48aab54cfe78cfc74d0c8ba099a905b  plasma-workspace-wallpapers-5.4.2.tar.xz
+64ed6fe8c59c2812b9c34cd8a3827735  polkit-kde-agent-1-5.4.2.tar.xz
+44dec41f77080fd83f2122fc2762f09a  powerdevil-5.4.2.tar.xz
+457b1b6d69fd52416485e08ed7744fe3  plasma-desktop-5.4.2.tar.xz
+b7049d459eccd6a5efbf55ff1c2121fb  kdeplasma-addons-5.4.2.tar.xz
+f8415a6a0e25a609d30c3d3ee2c9c696  kwayland-integration-5.4.2.tar.xz
+8adf666f98baf8f4f381d5515db4100b  kde-gtk-config-5.4.2.tar.xz
+e72368f28238ba7bacac81d5ff5e26f3  kgamma5-5.4.2.tar.xz
+f6fac3219aa8ba5056e06ad0c92773c9  ksshaskpass-5.4.2.tar.xz
+888836db6c8fb4f1cc381ed56a690204  kwallet-pam-5.4.2.tar.xz
+05b79b89c9708c046775448ec846c513  muon-5.4.2.tar.xz
+78e2931ed08b8fffae67d7aa0cd90f9f  plasma-mediacenter-5.4.2.tar.xz
+b399b81c4d773355e5d5ef7b4d1a73a5  plasma-pa-5.4.2.tar.xz
+c9bbe9a824400cbe7982aac0d8bdf6a3  plasma-sdk-5.4.2.tar.xz
+61585733e7a5585ea9ed203ad9b2a1a0  sddm-kcm-5.4.2.tar.xz
+5b0cb53813fc5f9a1406260d2a1109c7  user-manager-5.4.2.tar.xz</literal>
 EOF</userinput></screen>
 
Index: kde/plasma5/plasma5.xml
===================================================================
--- kde/plasma5/plasma5.xml	(revision e4192e55dc886bcb4c244f01ae5a5a3cc7a78b2b)
+++ kde/plasma5/plasma5.xml	(revision f97d5f6072ef1eebe7fe263d9c8fa6c6195836b3)
@@ -26,9 +26,9 @@
   </para>
 
-<!--
+
   <para>No additional configuration is needed before building the KDE Plasma 5
   because it uses the same configuration that KDE Frameworks 5 uses.</para>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="plasma-all.xml"/>
--->
+
 </chapter>
Index: packages.ent
===================================================================
--- packages.ent	(revision e4192e55dc886bcb4c244f01ae5a5a3cc7a78b2b)
+++ packages.ent	(revision f97d5f6072ef1eebe7fe263d9c8fa6c6195836b3)
@@ -21,4 +21,5 @@
 <!ENTITY linux-pam-version            "1.2.1">
 <!ENTITY linux-pam-docs-version       "1.2.0">
+<!ENTITY libpwquality-version         "1.3.0">
 <!ENTITY mitkrb-major-version         "1.13">
 <!ENTITY mitkrb-version               "&mitkrb-major-version;.2">
@@ -148,4 +149,5 @@
 <!ENTITY sbc-version                  "1.3">
 <!ENTITY talloc-version               "2.1.4">
+<!ENTITY wayland-version              "1.9.0">
 <!ENTITY wv-version                   "1.2.9">
 <!ENTITY xapian-version               "1.2.21">
Index: postlfs/security/libpwquality.xml
===================================================================
--- postlfs/security/libpwquality.xml	(revision f97d5f6072ef1eebe7fe263d9c8fa6c6195836b3)
+++ postlfs/security/libpwquality.xml	(revision f97d5f6072ef1eebe7fe263d9c8fa6c6195836b3)
@@ -0,0 +1,153 @@
+<?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 libpwquality-download-http "https://fedorahosted.org/releases/l/i/libpwquality/libpwquality-&libpwquality-version;.tar.bz2">
+  <!ENTITY libpwquality-download-ftp  " ">
+  <!ENTITY libpwquality-md5sum        "2a3d4ba1d11b52b4f6a7f39622ebf736">
+  <!ENTITY libpwquality-size          "416 KB">
+  <!ENTITY libpwquality-buildsize     "4.1 MB">
+  <!ENTITY libpwquality-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="libpwquality" xreflabel="libpwquality-&libpwquality-version;">
+  <?dbhtml filename="libpwquality.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: fernando $</othername>
+    <date>$Date: 2015-09-25 08:48:24 -0500 (Fri, 25 Sep 2015) $</date>
+  </sect1info>
+
+  <title>libpwquality-&libpwquality-version;</title>
+
+  <indexterm zone="libpwquality">
+    <primary sortas="a-ConsoleKit">ConsoleKit2</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to ConsoleKit</title>
+
+    <para>
+      The <application>libpwquality</application> package provideis common
+      functions for password quality checking and also scoring them based on
+      their apparent randomness. The library also provides a function for
+      generating random passwords with good pronounceability. 
+    </para>
+
+    &lfs78_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libpwquality-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libpwquality-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libpwquality-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libpwquality-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libpwquality-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libpwquality-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libpwquality Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="linux-pam"/> and
+      <xref linkend="cracklib"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/libpwquality"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libpwquality</title>
+
+    <para>
+      Install <application>libpwquality</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          pwscore and pwmake
+        </seg>
+        <seg>
+          pam_pwquality.so and libpwquality.so
+        </seg>
+        <seg>
+          /etc/security
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+<!--
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+
+      <varlistentry id="ck-history">
+        <term><command>ck-history</command></term>
+        <listitem>
+          <para>is a utility that provides information from the ConsoleKit
+                database about what users have logged into the system.</para>
+          <indexterm zone="libpwquality ck-history">
+            <primary sortas="b-ck-history">ck-history</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+-->
+  </sect2>
+
+</sect1>
Index: postlfs/security/security.xml
===================================================================
--- postlfs/security/security.xml	(revision e4192e55dc886bcb4c244f01ae5a5a3cc7a78b2b)
+++ postlfs/security/security.xml	(revision f97d5f6072ef1eebe7fe263d9c8fa6c6195836b3)
@@ -54,4 +54,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="linux-pam.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpwquality.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mitkrb.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nettle.xml"/>
Index: x/installing/libevdev.xml
===================================================================
--- x/installing/libevdev.xml	(revision e4192e55dc886bcb4c244f01ae5a5a3cc7a78b2b)
+++ 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 e4192e55dc886bcb4c244f01ae5a5a3cc7a78b2b)
+++ 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 e4192e55dc886bcb4c244f01ae5a5a3cc7a78b2b)
+++ 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"/>
 
