diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 733396c30..f2bf40f93 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -34,6 +34,9 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>February 26th, 2004 [jeremy]: Removed the creation of the
+/usr/etc directory to conform with FHS - closes bug 775</para></listitem>
+
 <listitem><para>February 26th, 2004 [jeremy]: Upgraded to Kernel 2.4.25</para></listitem>
 
 <listitem><para>February 23rd, 2004 [alex]: Chapters 6 + 9 : Cleaned up the
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index cf7f0c980..0df77c71e 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -211,14 +211,16 @@ standard tree:</para>
  
 <screen><userinput>mkdir -p /{bin,boot,dev/{pts,shm},etc/opt,home,lib,mnt,proc}
 mkdir -p /{root,sbin,tmp,usr/local,var,opt}
-for dirname in /usr /usr/local
-&nbsp;&nbsp;&nbsp;&nbsp;do
-&nbsp;&nbsp;&nbsp;&nbsp;mkdir $dirname/{bin,etc,include,lib,sbin,share,src}
-&nbsp;&nbsp;&nbsp;&nbsp;ln -s share/{man,doc,info} $dirname
-&nbsp;&nbsp;&nbsp;&nbsp;mkdir $dirname/share/{doc,info,locale,man}
-&nbsp;&nbsp;&nbsp;&nbsp;mkdir $dirname/share/{misc,terminfo,zoneinfo}
-&nbsp;&nbsp;&nbsp;&nbsp;mkdir $dirname/share/man/man{1,2,3,4,5,6,7,8}
-done
+mkdir /usr/{bin,include,lib,sbin,share,src}
+ln -s share/{man,doc,info} /usr
+mkdir /usr/share/{doc,info,locale,man}
+mkdir /usr/share/{misc,terminfo,zoneinfo}
+mkdir /usr/share/man/man{1,2,3,4,5,6,7,8}
+mkdir /usr/local/{bin,etc,include,lib,sbin,share,src}
+ln -s share/{man,doc,info} /usr/local
+mkdir /usr/local/share/{doc,info,locale,man}
+mkdir /usr/local/share/{misc,terminfo,zoneinfo}
+mkdir /usr/local/share/man/man{1,2,3,4,5,6,7,8}
 mkdir /var/{lock,log,mail,run,spool}
 mkdir -p /var/{tmp,opt,cache,lib/misc,local}
 mkdir /opt/{bin,doc,include,info}