Index: x/installing/installing.xml
===================================================================
--- x/installing/installing.xml	(revision ca33a20fe0d2e4ea891fc498b877a1ba7bb26a44)
+++ x/installing/installing.xml	(revision d06248eed48471f489f8ae1b8653e93f46de15d2)
@@ -69,5 +69,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcursor-themes.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7font.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xkeyboard-config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xkeyboard-config-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg-server.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7driver.xml"/>
Index: x/installing/xkeyboard-config-systemd.xml
===================================================================
--- x/installing/xkeyboard-config-systemd.xml	(revision d06248eed48471f489f8ae1b8653e93f46de15d2)
+++ x/installing/xkeyboard-config-systemd.xml	(revision d06248eed48471f489f8ae1b8653e93f46de15d2)
@@ -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 xkeyboard-config-download-http
+           "&xorg-download-http;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
+  <!ENTITY xkeyboard-config-download-ftp
+           "&xorg-download-ftp;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
+  <!ENTITY xkeyboard-config-md5sum        "1fd54ceb9092d1dbcaabaf03653092bc">
+  <!ENTITY xkeyboard-config-size          "916 KB">
+  <!ENTITY xkeyboard-config-buildsize     "19 MB">
+  <!ENTITY xkeyboard-config-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="xkeyboard-config" xreflabel="xkeyboard-config-&xkeyboard-config-version;">
+  <?dbhtml filename="xkeyboard-config.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>XKeyboardConfig-&xkeyboard-config-version;</title>
+
+  <indexterm zone="xkeyboard-config">
+    <primary sortas="a-XKeyboardConfig">XKeyboardConfig</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to XKeyboardConfig</title>
+
+    <para>
+      The <application>XKeyboardConfig</application> package contains
+      the keyboard configuration database for the X Window System.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&xkeyboard-config-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&xkeyboard-config-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &xkeyboard-config-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &xkeyboard-config-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &xkeyboard-config-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &xkeyboard-config-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">XKeyboardConfig Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libxslt"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="xorg7-proto"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/xkeyboard-config"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of XKeyboardConfig</title>
+
+    <para>
+      Install <application>XKeyboardConfig</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr          \
+            --disable-runtime-deps \
+            --with-xkb-rules-symlink=xorg &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="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--disable-runtime-deps</parameter>: This switch disables
+      checking for Xorg Protocol Headers which are only required for
+      <application>Xorg</application> at runtime.
+    </para>
+
+    <para>
+      <parameter>--with-xkb-rules-symlink=xorg</parameter>: By default, the
+      XKB rules installed are named "base". This creates symlinks named
+      "xorg" to those rules, which is the default name used by Xorg.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>None</seg>
+        <seg>
+          /usr/share/X11/xkb
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: installing/xkeyboard-config.xml
===================================================================
--- x/installing/xkeyboard-config.xml	(revision ca33a20fe0d2e4ea891fc498b877a1ba7bb26a44)
+++ 	(revision )
@@ -1,140 +1,0 @@
-<?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 xkeyboard-config-download-http
-  "&xorg-download-http;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
-  <!ENTITY xkeyboard-config-download-ftp
-  "&xorg-download-ftp;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
-  <!ENTITY xkeyboard-config-md5sum        "1fd54ceb9092d1dbcaabaf03653092bc">
-  <!ENTITY xkeyboard-config-size          "916 KB">
-  <!ENTITY xkeyboard-config-buildsize     "19 MB">
-  <!ENTITY xkeyboard-config-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xkeyboard-config" xreflabel="xkeyboard-config-&xkeyboard-config-version;">
-  <?dbhtml filename="xkeyboard-config.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>XKeyboardConfig-&xkeyboard-config-version;</title>
-
-  <indexterm zone="xkeyboard-config">
-    <primary sortas="a-XKeyboardConfig">XKeyboardConfig</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to XKeyboardConfig</title>
-
-    <para>
-      The <application>XKeyboardConfig</application> package contains
-      the keyboard configuration database for the X Window System.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xkeyboard-config-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xkeyboard-config-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xkeyboard-config-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xkeyboard-config-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xkeyboard-config-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xkeyboard-config-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">XKeyboardConfig Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/xkeyboard-config"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of XKeyboardConfig</title>
-
-    <para>
-      Install <application>XKeyboardConfig</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure $XORG_CONFIG --with-xkb-rules-symlink=xorg &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="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-xkb-rules-symlink=xorg</parameter>: By default, the
-      XKB rules installed are named "base". This creates symlinks named
-      "xorg" to those rules, which is the default name used by Xorg.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>
-          <envar>$XORG_PREFIX</envar>/share/X11/xkb
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision ca33a20fe0d2e4ea891fc498b877a1ba7bb26a44)
+++ x/lib/lib.xml	(revision d06248eed48471f489f8ae1b8653e93f46de15d2)
@@ -48,4 +48,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imlib2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdrm.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libepoxy-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libglade.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnotify.xml"/>
Index: x/lib/libepoxy-systemd.xml
===================================================================
--- x/lib/libepoxy-systemd.xml	(revision d06248eed48471f489f8ae1b8653e93f46de15d2)
+++ x/lib/libepoxy-systemd.xml	(revision d06248eed48471f489f8ae1b8653e93f46de15d2)
@@ -0,0 +1,158 @@
+<?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 libepoxy-download-http "https://github.com/anholt/libepoxy/archive/v-&libepoxy-version;.tar.gz">
+  <!ENTITY libepoxy-download-ftp  " ">
+  <!ENTITY libepoxy-md5sum        "12d6b7621f086c0c928887c27d90bc30">
+  <!ENTITY libepoxy-size          "264 KB">
+  <!ENTITY libepoxy-buildsize     "27 MB">
+  <!ENTITY libepoxy-time          "0.2 SBU">
+]>
+
+<sect1 id="libepoxy" xreflabel="libepoxy-&libepoxy-version;">
+  <?dbhtml filename="libepoxy.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libepoxy-&libepoxy-version;</title>
+
+  <indexterm zone="libepoxy">
+    <primary sortas="a-libepoxy">libepoxy</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libepoxy</title>
+
+    <para>
+      <application>libepoxy</application> is a library for handling OpenGL
+      function pointer management.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libepoxy-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libepoxy-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libepoxy-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libepoxy-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libepoxy-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libepoxy-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libepoxy Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="mesalib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="python3"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libepoxy"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libepoxy</title>
+
+    <para>
+      Install <application>libepoxy</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./autogen.sh --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make -k check</command>. Some
+      test may fail for unknown reasons.
+    </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>
+          None
+        </seg>
+        <seg>
+          libepoxy.so
+        </seg>
+        <seg>
+          /usr/include/epoxy
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+
+      <varlistentry id="libepoxy-lib">
+        <term><filename class="libraryfile">libepoxy.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions for handling OpenGL function
+            pointer management.
+          </para>
+          <indexterm zone="libepoxy libepoxy-lib">
+            <primary sortas="c-libepoxy">libepoxy.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
