Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 5b0a978e5d9c65837d7fe23ee7023fc5000c0ae3)
+++ general/genlib/genlib.xml	(revision 3609a85de828665557ffcd021403c34480e39f1b)
@@ -154,4 +154,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-glib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="uchardet.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="umockdev.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="wayland-protocols.xml"/>
Index: general/genlib/libgudev.xml
===================================================================
--- general/genlib/libgudev.xml	(revision 5b0a978e5d9c65837d7fe23ee7023fc5000c0ae3)
+++ general/genlib/libgudev.xml	(revision 3609a85de828665557ffcd021403c34480e39f1b)
@@ -82,5 +82,5 @@
       <xref linkend="gobject-introspection"/> (for gir-data, needed for GNOME),
       <xref linkend="gtk-doc"/>, and
-      <ulink url="https://github.com/martinpitt/umockdev">umockdev</ulink>
+      <xref linkend="umockdev"/> (for testing)
     </para>
 
@@ -102,5 +102,6 @@
 
     <para>
-      This package does not come with a testsuite.
+      If you wish to run the test suite, omit "--disable-umockdev" from the
+      configure command and then issue: <command>make check</command>.
     </para>
 
@@ -118,4 +119,10 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+    <para>
+      <parameter>--disable-umockdev</parameter>: Disables the usage of
+      <xref role="nodep" linkend="umockdev"/>. Omit this switch if you
+      wish to run the test suite.
+    </para>
 
   </sect2>
Index: general/genlib/umockdev.xml
===================================================================
--- general/genlib/umockdev.xml	(revision 3609a85de828665557ffcd021403c34480e39f1b)
+++ general/genlib/umockdev.xml	(revision 3609a85de828665557ffcd021403c34480e39f1b)
@@ -0,0 +1,210 @@
+<?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 umockdev-download-http "https://github.com/martinpitt/umockdev/releases/download/&umockdev-version;/umockdev-&umockdev-version;.tar.xz">
+  <!ENTITY umockdev-download-ftp  " ">
+  <!ENTITY umockdev-md5sum        "6c8c200017986aba95e8ee756ccef88a">
+  <!ENTITY umockdev-size          "744 KB">
+  <!ENTITY umockdev-buildsize     "13 MB">
+  <!ENTITY umockdev-time          "0.2 SBU">
+
+]>
+
+<sect1 id="umockdev" xreflabel="umockdev-&umockdev-version;">
+  <?dbhtml filename="umockdev.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Umockdev-&umockdev-version;</title>
+
+  <indexterm zone="umockdev">
+    <primary sortas="a-umockdev">umockdev</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Umockdev</title>
+
+    <para>
+      The <application>Umockdev</application> package contains a framework
+      that allows a developer to mock devices for use in unit testing.
+    </para>
+
+    &lfs91_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&umockdev-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&umockdev-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &umockdev-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &umockdev-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &umockdev-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &umockdev-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Umockdev Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libgudev"/> and
+      <xref linkend="vala"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <ulink url="http://www.gphoto.org/">libgphoto2</ulink> (optional for tests)
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/umockdev"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Umockdev</title>
+
+    <para>
+      Install <application>Umockdev</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &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"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+           umockdev-record,
+           umockdev-run, and
+           umockdev-wrapper
+        </seg>
+        <seg>
+          libumockdev-preload.so.0 <!-- Only intended for use by
+          umockdev-wrapper. Don't put in a short description for this--> and
+          libumockdev.so
+        </seg>
+        <seg>
+          /usr/include/umockdev-1.0 and
+          /usr/share/doc/umockdev
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="umockdev-record">
+        <term><command>umockdev-record</command></term>
+        <listitem>
+          <para>
+            records Linux devices and their ancestors from sysfs/udev or
+            records ioctls for a device.
+          </para>
+          <indexterm zone="umockdev umockdev-record">
+            <primary sortas="b-umockdev-record">umockdev-record</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="umockdev-run">
+        <term><command>umockdev-run</command></term>
+        <listitem>
+          <para>
+            runs a program under an <application>umockdev</application>
+            testbed.
+          </para>
+          <indexterm zone="umockdev umockdev-run">
+            <primary sortas="b-umockdev-run">umockdev-run</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="umockdev-wrapper">
+        <term><command>umockdev-wrapper</command></term>
+        <listitem>
+          <para>
+            wraps a program around 
+            <filename class="libraryfile">libumockdev-preload.so.0</filename>
+            through LD_PRELOAD.
+          </para>
+          <indexterm zone="umockdev umockdev-wrapper">
+            <primary sortas="b-umockdev-wrapper">umockdev-wrapper</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libumockdev">
+        <term><filename class="libraryfile">libumockdev.so</filename></term>
+        <listitem>
+          <para>
+            provides API functions that allow mocking hardware devices for unit
+            testing.
+          </para>
+          <indexterm zone="umockdev libumockdev">
+            <primary sortas="c-libumockdev">libumockdev.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+</sect1>
