Index: archive/udev-extras-old.xml
===================================================================
--- archive/udev-extras-old.xml	(revision d1fe212b6059b88dbb4443b6d5635d58600d458f)
+++ archive/udev-extras-old.xml	(revision d1fe212b6059b88dbb4443b6d5635d58600d458f)
@@ -0,0 +1,161 @@
+<?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 systemd-download-http "http://www.freedesktop.org/wiki/Software/systemd/">
+  <!ENTITY systemd-download-ftp  " ">
+  <!-- <!ENTITY udev-md5sum        " "> -->
+  <!ENTITY systemd-size          "1.3 MB">
+  <!ENTITY systemd-buildsize     "314 MB">
+  <!ENTITY systemd-time          "3.5 SBU">
+]>
+
+<sect1 id="udev-extras" xreflabel="udev-extras (from systemd)">
+  <?dbhtml filename="udev-extras.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Udev Extras (from systemd)</title>
+
+  <indexterm zone="udev-extras">
+    <primary sortas="a-udev-extras">udev extras (from systemd)</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Udev Extras</title>
+
+    <para>Udev was installed as a part of systemd in LFS. However, not
+    all components were installed due to dependencies that were unavailable.
+    This procedure adds those missing components.</para>
+
+    <!-- &lfs75_checked; -->
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&systemd-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&systemd-download-ftp;"/></para>
+      </listitem>
+      <!-- <listitem>
+        <para>Download MD5 sum: &systemd-md5sum;</para>
+      </listitem> -->
+      <listitem>
+        <para>Download size: &systemd-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &systemd-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &systemd-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Udev Extras Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="glib2"/> (for the gudev library)
+    </para>
+
+    <bridgehead renderas="sect4">Optional Dependencies</bridgehead>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/> (for gir-data, needed for Gnome)
+    </para>
+
+    <bridgehead renderas="sect4">Optional Runtime Dependencies</bridgehead>
+    <para role="optional">
+      <xref linkend="pciutils"/> and
+      <xref linkend="usbutils"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/udev-extras"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Udev Extras</title>
+
+    <para>First, build systemd:</para>
+
+<screen><userinput>./configure --disable-tests &amp;&amp;
+make</userinput></screen>
+
+   <caution><para>If you maintained the default System V/systemd 
+   installation in LFS, do not run <userinput>make install</userinput>.
+   It will overwrite the symbolic links needed to switch boot 
+   systems.</para></caution>
+
+   <para>Now install gudev as the <systemitem class="username">root</systemitem> 
+   user:</para>
+
+<screen><userinput>mkdir -pv /usr/include/gudev-1.0/gudev /usr/share/gtk-doc/html/gudev &amp;&amp;
+
+cp -v src/gudev/gudev.h             /usr/include/gudev-1.0/gudev &amp;&amp;
+cp -v src/gudev/gudev[a-e,t]*.h     /usr/include/gudev-1.0/gudev &amp;&amp;
+cp -v .libs/libgudev-1.0.so.0.2.0   /usr/lib                     &amp;&amp;
+
+ln -svfn libgudev-1.0.so.0.2.0      /usr/lib/libgudev-1.0.so     &amp;&amp;
+ln -svfn libgudev-1.0.so.0.2.0      /usr/lib/libgudev-1.0.so.0   &amp;&amp;
+
+cp -v src/gudev/gudev-1.0.pc        /usr/lib/pkgconfig           &amp;&amp;
+cp -v docs/gudev/html/*             /usr/share/gtk-doc/html/gudev</userinput></screen>
+
+    <para>If the optional gobject-introspection package is available, install
+    the gir-data files as the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen><userinput>mkdir -pv /usr/lib/girepository-1.0 /usr/share/gir-1.0  &amp;&amp;
+
+cp -v src/gudev/GUdev-1.0.typelib /usr/lib/girepository-1.0 &amp;&amp;
+cp -v src/gudev/GUdev-1.0.gir     /usr/share/gir-1.0</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+
+        <seg>libgudev-1.0.so</seg>
+
+        <seg>/usr/include/gudev-1.0/gudev,
+             /usr/lib/girepository-1.0,
+             /usr/share/gir-1.0, and
+             /usr/share/gtk-doc/html/gudev</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libgudev-1.0-systemd">
+        <term><filename class='libraryfile'>libgudev-1.0.so</filename></term>
+        <listitem>
+          <para>is a GObject-based wrapper library for libudev.</para>
+          <indexterm zone="udev-extras libgudev-1.0-systemd">
+            <primary sortas="c-libgudev-1.0-systemd">libgudev-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general.ent
===================================================================
--- general.ent	(revision 5466683102e531844bdf134336cee5276687d559)
+++ general.ent	(revision d1fe212b6059b88dbb4443b6d5635d58600d458f)
@@ -342,4 +342,5 @@
 <!ENTITY cpio-version                 "2.11">
 <!ENTITY dbus-version                 "1.8.2">   <!-- Even minors only -->
+<!ENTITY eudev-version                "1.6">
 <!ENTITY fcron-version                "3.1.2">
 <!ENTITY gpm-version                  "1.20.7">
Index: general/sysutils/udev-extras.xml
===================================================================
--- general/sysutils/udev-extras.xml	(revision 5466683102e531844bdf134336cee5276687d559)
+++ general/sysutils/udev-extras.xml	(revision d1fe212b6059b88dbb4443b6d5635d58600d458f)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY systemd-download-http "http://www.freedesktop.org/wiki/Software/systemd/">
-  <!ENTITY systemd-download-ftp  " ">
-  <!-- <!ENTITY udev-md5sum        " "> -->
-  <!ENTITY systemd-size          "1.3 MB">
-  <!ENTITY systemd-buildsize     "314 MB">
-  <!ENTITY systemd-time          "3.5 SBU">
+  <!ENTITY eudev-download-http "http://dev.gentoo.org/~blueness/eudev/eudev-&eudev-version;.tar.gz">
+  <!ENTITY eudev-download-ftp  " ">
+  <!ENTITY eudev-md5sum        "c2fbf420a50d07b80158a0185cbb08f7">
+  <!ENTITY eudev-size          "1.7 MB">
+  <!ENTITY eudev-buildsize     "97 MB">
+  <!ENTITY eudev-time          "0.4 SBU">
 ]>
 
-<sect1 id="udev-extras" xreflabel="udev-extras (from systemd)">
+<sect1 id="udev-extras" xreflabel="udev-extras (from eudev)">
   <?dbhtml filename="udev-extras.html"?>
 
@@ -21,8 +21,8 @@
   </sect1info>
 
-  <title>Udev Extras (from systemd)</title>
+  <title>Udev Extras (from eudev)</title>
 
   <indexterm zone="udev-extras">
-    <primary sortas="a-udev-extras">udev extras (from systemd)</primary>
+    <primary sortas="a-udev-extras">udev extras (from eudev)</primary>
   </indexterm>
 
@@ -30,5 +30,5 @@
     <title>Introduction to Udev Extras</title>
 
-    <para>Udev was installed as a part of systemd in LFS. However, not
+    <para>Udev was installed as a part of eudev in LFS. However, not
     all components were installed due to dependencies that were unavailable.
     This procedure adds those missing components.</para>
@@ -39,20 +39,20 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&systemd-download-http;"/></para>
+        <para>Download (HTTP): <ulink url="&eudev-download-http;"/></para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&systemd-download-ftp;"/></para>
-      </listitem>
-      <!-- <listitem>
-        <para>Download MD5 sum: &systemd-md5sum;</para>
-      </listitem> -->
-      <listitem>
-        <para>Download size: &systemd-size;</para>
+        <para>Download (FTP): <ulink url="&eudev-download-ftp;"/></para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &systemd-buildsize;</para>
+        <para>Download MD5 sum: &eudev-md5sum;</para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &systemd-time;</para>
+        <para>Download size: &eudev-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &eudev-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &eudev-time;</para>
       </listitem>
     </itemizedlist>
@@ -62,10 +62,11 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="glib2"/> (for the gudev library)
+      <xref linkend="glib2"/>
     </para>
 
     <bridgehead renderas="sect4">Optional Dependencies</bridgehead>
     <para role="optional">
-      <xref linkend="gobject-introspection"/> (for gir-data, needed for Gnome)
+      <xref linkend="gobject-introspection"/> (for gir-data, needed for Gnome), and 
+      <xref linkend="gtk-doc"/> (to rebuild the documentation)
     </para>
 
@@ -84,39 +85,52 @@
     <title>Installation of Udev Extras</title>
 
-    <para>First, build systemd:</para>
+    <para>First, re-build eudev:</para>
 
-<screen><userinput>./configure --disable-tests &amp;&amp;
+<screen><userinput>sed    -i '/struct ucred/i struct ucred;' src/libudev/util.h &amp;&amp;
+sed -r -i 's|/usr(/bin/test)|\1|'         test/udev-test.pl  &amp;&amp;
+
+./configure --prefix=/usr           \
+            --bindir=/sbin          \
+            --sbindir=/sbin         \
+            --libdir=/usr/lib       \
+            --sysconfdir=/etc       \
+            --libexecdir=/lib       \
+            --with-rootprefix=      \
+            --with-rootlibdir=/lib  \
+            --enable-split-usr      \
+            --enable-libkmod        \
+            --enable-rule_generator \
+            --enable-keymap         \
+            --disable-introspection \
+            --disable-gtk-doc-html  \
+            --with-firmware-path=/lib/firmware &amp;&amp;
+
 make</userinput></screen>
 
-   <caution><para>If you maintained the default System V/systemd 
-   installation in LFS, do not run <userinput>make install</userinput>.
-   It will overwrite the symbolic links needed to switch boot 
-   systems.</para></caution>
+   <para>To test the results, issue: <userinput>make check</userinput>.</para> 
 
-   <para>Now install gudev as the <systemitem class="username">root</systemitem> 
+   <para>Now re-install as the <systemitem class="username">root</systemitem> 
    user:</para>
 
-<screen><userinput>mkdir -pv /usr/include/gudev-1.0/gudev /usr/share/gtk-doc/html/gudev &amp;&amp;
-
-cp -v src/gudev/gudev.h             /usr/include/gudev-1.0/gudev &amp;&amp;
-cp -v src/gudev/gudev[a-e,t]*.h     /usr/include/gudev-1.0/gudev &amp;&amp;
-cp -v .libs/libgudev-1.0.so.0.2.0   /usr/lib                     &amp;&amp;
-
-ln -svfn libgudev-1.0.so.0.2.0      /usr/lib/libgudev-1.0.so     &amp;&amp;
-ln -svfn libgudev-1.0.so.0.2.0      /usr/lib/libgudev-1.0.so.0   &amp;&amp;
-
-cp -v src/gudev/gudev-1.0.pc        /usr/lib/pkgconfig           &amp;&amp;
-cp -v docs/gudev/html/*             /usr/share/gtk-doc/html/gudev</userinput></screen>
-
-    <para>If the optional gobject-introspection package is available, install
-    the gir-data files as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen><userinput>mkdir -pv /usr/lib/girepository-1.0 /usr/share/gir-1.0  &amp;&amp;
-
-cp -v src/gudev/GUdev-1.0.typelib /usr/lib/girepository-1.0 &amp;&amp;
-cp -v src/gudev/GUdev-1.0.gir     /usr/share/gir-1.0</userinput></screen>
+<screen><userinput>make install</userinput></screen>
 
   </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--disable-introspection</parameter>: This prevents the
+      gir-data instructions from running.  Remove this option if the optional
+      <xref linkend="gobject-introspection"/> package is installed.
+    </para>
+
+    <para>
+      <parameter>--disable-gtk-doc-html</parameter>: This prevents the
+      building of the html data.  Remove this option if the optional
+      <xref linkend="gtk-doc"/> package is installed.
+    </para>
+
+  </sect2> 
 
   <sect2 role="content">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 5466683102e531844bdf134336cee5276687d559)
+++ introduction/welcome/changelog.xml	(revision d1fe212b6059b88dbb4443b6d5635d58600d458f)
@@ -49,4 +49,7 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update udev-extras to use eudev.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Restore full dbus build to the book.
           Update to dbus-1.8.2.  Fixes
