diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 17076b756..b5df8f856 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,17 @@
     </listitem>
 -->
 
+    <listitem>
+      <para>2006-12-09</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bryan] - Fix /etc/passwd entry for &quot;nobody&quot; user
+          in chapter 6. Fixes <ulink url="&lfs-ticket-root;1931">#1931</ulink>;
+          thanks to Robert Connolly for the report.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem> 
       <para>2006-12-01</para>
       <itemizedlist>
@@ -54,8 +65,8 @@
       <itemizedlist>
         <listitem>
           <para>[jhuntwork] - Add a cautionary note to the end of chapter 5.
-	  Archiving of the temporary tools for future use should take place
-	  before starting chapter 6.
+          Archiving of the temporary tools for future use should take place
+          before starting chapter 6.
           Fixes <ulink url="&lfs-ticket-root;1879">#1879</ulink></para>
         </listitem>
         <listitem>
@@ -71,11 +82,11 @@
           configure network interfaces. Thanks to Marty Jack for the report and
           the fix. Fixes <ulink url="&lfs-ticket-root;1914">#1914</ulink></para>
         </listitem>
-	<listitem>
-	  <para>[jhuntwork] - Fix potential corruption of the testsuite tools
-	  by forcing expect to always use /bin/stty and not /usr/local/bin/stty.
+        <listitem>
+          <para>[jhuntwork] - Fix potential corruption of the testsuite tools
+          by forcing expect to always use /bin/stty and not /usr/local/bin/stty.
           Fixes <ulink url="&lfs-ticket-root;1892">#1892</ulink></para>
-	</listitem>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to Man-pages-1.42. Fixes
           <ulink url="&lfs-ticket-root;1922">#1922</ulink></para>
@@ -86,13 +97,13 @@
           to Joe Ciccone for the report and the updated patch. Fixes
           <ulink url="&lfs-ticket-root;1915">#1915</ulink></para>
         </listitem>
-	<listitem>
-	   <para>[jhuntwork] - Added 'make headers_install' to chapter 5
-	   Linux Headers for the educational value and in preparation of
-	   changes in Linux-2.6.19. See
-	   <ulink url="&lfs-root;/pipermail/lfs-dev/2006-November/058550.html">
-	   this thread.</ulink></para>
-	</listitem>
+        <listitem>
+          <para>[jhuntwork] - Added 'make headers_install' to chapter 5
+          Linux Headers for the educational value and in preparation of
+          changes in Linux-2.6.19. See
+          <ulink url="&lfs-root;/pipermail/lfs-dev/2006-November/058550.html">
+          this thread.</ulink></para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to M4-1.4.8. Fixes
           <ulink url="&lfs-ticket-root;1920">1920</ulink></para>
@@ -140,7 +151,7 @@
       <itemizedlist>
         <listitem>
           <para>[jhuntwork] - Simplified the installation of
-	  Linux Headers in Chapter 5.</para>
+          Linux Headers in Chapter 5.</para>
         </listitem>
       </itemizedlist>
     </listitem>
diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml
index 85a6cd7da..32896f1a6 100644
--- a/chapter06/createfiles.xml
+++ b/chapter06/createfiles.xml
@@ -63,7 +63,7 @@ ln -sv bash /bin/sh</userinput></screen>
 
 <screen><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"
 <literal>root:x:0:0:root:/root:/bin/bash
-nobody:x:99:99:nobody:Unprivileged User:/bin/false</literal>
+nobody:x:99:99:Unprivileged User:/dev/null:/bin/false</literal>
 EOF</userinput></screen>
 
   <para>The actual password for <systemitem class="username">root</systemitem>
diff --git a/general.ent b/general.ent
index c4e0a8657..26dedd8b0 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20061201">
-<!ENTITY releasedate "December 1, 2006">
+<!ENTITY version "SVN-20061209">
+<!ENTITY releasedate "December 9, 2006">
 <!ENTITY milestone "6.3">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->