diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index e19655e3e..4b8d769b9 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,13 @@
     <listitem>
       <para>2010-06-27</para>
       <itemizedlist>
+         <listitem>
+           <para>[bdubbs] - Update to udev-158.  Also add a new
+           udev-testfiles tarball and an instuction to make check.
+           Fixes
+           <ulink url="&lfs-ticket-root;2692">#2692</ulink> and
+           <ulink url="&lfs-ticket-root;2700">#2700</ulink>.</para>
+         </listitem>
          <listitem>
            <para>[bdubbs] - Update to sysvinit-2.88dsf.
            Fixes
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 96eb6694d..c58d4ad73 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -112,9 +112,9 @@
     <!--<listitem>
       <para>Less &less-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>LFS-Bootscripts &lfs-bootscripts-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Libtool &libtool-version;</para>
     </listitem>
@@ -187,9 +187,9 @@
     <!--<listitem>
       <para>Texinfo &texinfo-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Udev &udev-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>&udev-config;</para>
     </listitem>-->
@@ -232,6 +232,10 @@
       <para>MPC-&mpc-version;</para>
     </listitem>
 
+    <listitem>
+      <para>udev-&udev-version;-testfiles.tar.bz2</para>
+    </listitem>
+
   </itemizedlist>
 
   <itemizedlist>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 331d7c42e..2de4c9252 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -550,11 +550,19 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Udev (&udev-version;) - <token>&udev-size;</token>:</term>
+      <term>Udev Test Tarball(&udev-version;) - <token>&udev-testfiles-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&udev-home;"/></para>
-        <para>Download: <ulink url="&udev-url;"/></para>
-        <para>MD5 sum: <literal>&udev-md5;</literal></para>
+        <para>Download: <ulink url="&udev-testfiles-url;"/></para>
+        <para>MD5 sum: <literal>&udev-testfiles-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Udev Test Tarball - <token>&udev-config-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&udev-config-home;"/></para>
+        <para>Download: <ulink url="&udev-config-url;"/></para>
+        <para>MD5 sum: <literal>&udev-config-md5;</literal></para>
       </listitem>
     </varlistentry>
 
diff --git a/chapter06/udev.xml b/chapter06/udev.xml
index ab8368c9f..20d3eb98c 100644
--- a/chapter06/udev.xml
+++ b/chapter06/udev.xml
@@ -32,7 +32,7 @@
 
       <seglistitem>
         <seg>&udev-ch6-sbu;</seg>
-        <seg>&udev-ch6-du;</seg>
+        <seg>&udev-ch6-du; plus &udev-testfiles-du; for testfiles</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -46,6 +46,12 @@
 
 <screen><userinput remap="pre">tar -xvf ../&udev-config;.tar.bz2</userinput></screen>
 
+    <para>The udev-testfiles tarball contains files needed to test udev. The 
+    file expands to an apparant size of about 37MB but the actual disk usage
+    is less than 7MB.</para>
+
+<screen><userinput remap="pre">tar -xvf ../udev-&udev-version;-testfiles.tar.bz2 --strip-components=1</userinput></screen>
+
     <para>Create some devices and directories that Udev cannot handle due to
     them being required very early in the boot process, or by Udev itself:</para>
 
@@ -111,7 +117,9 @@ mknod -m0666 /lib/udev/devices/null c 1 3</userinput></screen>
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>Test the package.</para>
+
+<screen><userinput remap="test">make check</userinput></screen>
 
     <para>Install the package:</para>
 
diff --git a/packages.ent b/packages.ent
index c75ec9b57..9bd627abb 100644
--- a/packages.ent
+++ b/packages.ent
@@ -513,14 +513,19 @@
 <!ENTITY texinfo-ch6-du "21 MB">
 <!ENTITY texinfo-ch6-sbu "0.3 SBU">
 
-<!ENTITY udev-version "157">
-<!ENTITY udev-size "523 KB">
+<!ENTITY udev-version "158">
+<!ENTITY udev-size "526 KB">
 <!ENTITY udev-url "&kernel;linux/utils/kernel/hotplug/udev-&udev-version;.tar.bz2">
-<!ENTITY udev-md5 "0ea39cc875116982abf200eb16c1b53e">
+<!ENTITY udev-md5 "26f99dde11f8e393d659614d7d1a3964">
 <!ENTITY udev-home "&kernel;linux/utils/kernel/hotplug/udev.html">
-<!ENTITY udev-ch6-du "11.6 MB">
+<!ENTITY udev-ch6-du "9.3 MB">
 <!ENTITY udev-ch6-sbu "0.2 SBU">
 
+<!ENTITY udev-testfiles-url "http://anduin.linuxfromscratch.org/sources/other/udev-&udev-version;-testfiles.tar.bz2">
+<!ENTITY udev-testfiles-size "147">
+<!ENTITY udev-testfiles-md5 "56dc32b500c3e6d788662359634c4d92">
+<!ENTITY udev-testfiles-du "6.8 MB">
+
 <!ENTITY udev-config "udev-config-20100128"> <!-- Scripts depend on this format -->
 <!ENTITY udev-config-size "UDEV-SIZE KB">    <!-- Updated in Makefile -->
 <!ENTITY udev-config-url "&downloads-root;&udev-config;.tar.bz2">