diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 654808438..b82446a31 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,13 @@
     <listitem>
       <para>2007-03-19</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Change the default home directory for new users and
+          do not create mail spool files for them.  Add a
+          <systemitem class="groupname">mail</systemitem> group so that if
+          Shadow is configured to create mail spool files for new users, it can 
+          do so without issuing a warning.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to Shadow-4.0.18.1.  Fixes
           <ulink url="&lfs-ticket-root;1850">#1850</ulink></para>
diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml
index 32896f1a6..581c921b6 100644
--- a/chapter06/createfiles.xml
+++ b/chapter06/createfiles.xml
@@ -89,6 +89,7 @@ video:x:12:
 utmp:x:13:
 usb:x:14:
 cdrom:x:15:
+mail:x:34:
 nogroup:x:99:</literal>
 EOF</userinput></screen>
 
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 210d90bf3..8c62ff81a 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -158,6 +158,14 @@ ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen>
 
 <screen><userinput>grpconv</userinput></screen>
 
+    <para>Shadow's stock configuration for the <command>useradd</command>
+    utility is not suitable for LFS systems.  Use the following commands to
+    change the default home directory for new users and prevent the creation of
+    mail spool files:</para>
+
+<screen><userinput>useradd -D -b /home
+sed -i 's/yes/no/' /etc/default/useradd</userinput></screen>
+
   </sect2>
 
   <sect2 role="configuration">