diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c3896257f..79fa84aef 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -81,6 +81,11 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>March 2, 2005 [matt]: Add note regarding potential
+custom features in a host distribution's version of e2fsprogs.  Fixes
+bug 1047.  Thanks to Steve Crosby for the suggested explanatory text.</para>
+</listitem>
+
 <listitem><para>March 2, 2005 [jim]: Update download locations
 </para></listitem>
 
diff --git a/chapter02/creatingfilesystem.xml b/chapter02/creatingfilesystem.xml
index f013b9dec..2a10e1c1b 100644
--- a/chapter02/creatingfilesystem.xml
+++ b/chapter02/creatingfilesystem.xml
@@ -22,6 +22,33 @@ url="&blfs-root;view/svn/postlfs/filesystems.html"/>.</para>
 <para>Replace <replaceable>[xxx]</replaceable> with the name of the LFS
 partition (<filename class="devicefile">hda5</filename> in our previous example).</para>
 
+<note><para>Some host distributions use custom features in their filesystem
+creation tools (e2fsprogs).  This can cause problems when booting into your new
+LFS in Chapter 9, as those features will not be supported by the LFS-installed
+e2fsprogs; you will get an error similar to <quote>unsupported filesystem
+features, upgrade your e2fsprogs</quote>.  To check if your host system
+uses custom enhancements, run the following command:</para>
+
+<screen><userinput>debugfs -R feature /dev/<replaceable>[xxx]</replaceable></userinput></screen>
+
+<para>If the output contains features other than: dir_index; filetype;
+large_file; resize_inode or sparse_super then your host system may have custom
+enhancements.  In that case, to avoid later problems, you should compile the
+stock e2fsprogs package and use the resulting binaries to re-create the
+filesystem on your LFS partition:</para>
+
+<screen><userinput>cd /tmp
+tar xjf /path/to/sources/e2fsprogs-1.36.tar.bz2
+cd e2fsprogs-1.36
+mkdir build
+cd build
+../configure
+make #note that we intentionally don't 'make install' here!
+./misc/mke2fs /dev/<replaceable>[xxx]</replaceable>
+cd /tmp
+rm -rf e2fsprogs-1.36</userinput></screen>
+</note>
+
 <para>If a swap partition was created, it will need to be initialized
 as a swap partition too (also known as formatting, as described above
 with <command>mke2fs</command>) by running the following. If you are using an existing