diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 705542e34..d026cbc74 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -42,6 +42,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Glibc FHS Patch - <token>&glibc-fhs-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&glibc-fhs-patch;"/></para>
+        <para>MD5 sum: <literal>&glibc-fhs-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Kbd Backspace/Delete Fix Patch - <token>&kbd-backspace-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter05/xz.xml b/chapter05/xz.xml
index 45be49fb6..ea1ea4966 100644
--- a/chapter05/xz.xml
+++ b/chapter05/xz.xml
@@ -6,10 +6,10 @@
 ]>
 
 <sect1 id="ch-tools-xz" role="wrap">
-  <?dbhtml filename="xz-utils.html"?>
+  <?dbhtml filename="xz.html"?>
 
   <sect1info condition="script">
-    <productname>xz-utils</productname>
+    <productname>xz</productname>
     <productnumber>&xz-version;</productnumber>
     <address>&xz-url;</address>
   </sect1info>
@@ -41,7 +41,7 @@
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of Xz-Utils</title>
+    <title>Installation of Xz</title>
 
     <para>Prepare Xz for compilation:</para>
 
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index 8ec53658b..28d50e9a9 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -140,12 +140,12 @@ chmod -v 755 /usr/bin/lex</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="libfl.so">
-        <term><filename class="libraryfile">libfl.so</filename></term>
+      <varlistentry id="libfl">
+        <term><filename class="libraryfile">libfl</filename></term>
         <listitem>
           <para>The <filename class="libraryfile">flex</filename> library</para>
-          <indexterm zone="ch-system-flex libfl.so">
-            <primary sortas="c-libfl.so">libfl.so</primary>
+          <indexterm zone="ch-system-flex libfl">
+            <primary sortas="c-libfl">libfl</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index c88b6a6b0..d64b81219 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -58,6 +58,13 @@
 
 <screen><userinput remap="pre">sed -i 's/\\$$(pwd)/`pwd`/' timezone/Makefile</userinput></screen>
 
+    <para>Some of the Glibc programs use non-FHS compilant
+    <filename class="directory">/var/db</filename> directory to store
+    their runtime data. Apply the following patch to make such programs
+    store their runtime data in the FHS-compliant locations:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&glibc-fhs-patch;</userinput></screen>
+
     <para>The Glibc build system is self-contained and will install
     perfectly, even though the compiler specs file and linker are still
     pointing at <filename class="directory">/tools</filename>. The specs
@@ -168,6 +175,12 @@ grep Error glibc-check-log</userinput></screen>
 
 <screen><userinput remap="install">make install</userinput></screen>
 
+    <para>Install the configuration file and runtime directory for
+    <command>nscd</command>:</para>
+
+<screen><userinput remap="install">cp -v ../glibc-&glibc-version;/nscd/nscd.conf /etc/nscd.conf
+mkdir -pv /var/cache/nscd</userinput></screen>
+
     <para>The locales that can make the system respond in a different language
     were not installed by the above command. None of the locales are required,
     but if some of them are missing, test suites of the future packages would
@@ -413,8 +426,9 @@ mkdir -pv /etc/ld.so.conf.d</userinput></screen>
         /usr/include/netipx, /usr/include/netiucv, /usr/include/netpacket,
         /usr/include/netrom, /usr/include/netrose, /usr/include/nfs,
         /usr/include/protocols, /usr/include/rpc, /usr/include/rpcsvc,
-        /usr/include/sys, /usr/lib/audit, /usr/lib/gconv, /usr/lib/glibc,
-        /usr/lib/locale, /usr/share/i18n, /usr/share/zoneinfo, /var/db</seg>
+        /usr/include/sys, /usr/lib/audit, /usr/lib/gconv, /usr/lib/locale,
+        /usr/libexec/getconf, /usr/share/i18n, /usr/share/zoneinfo,
+        /var/cache/nscd, and /var/lib/nss_db</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/mpfr.xml b/chapter06/mpfr.xml
index 00bb8e164..708101891 100644
--- a/chapter06/mpfr.xml
+++ b/chapter06/mpfr.xml
@@ -43,9 +43,9 @@
 
     <para>Prepare MPFR for compilation:</para>
 
-<screen><userinput remap="configure">./configure  --prefix=/usr        \
-             --enable-thread-safe \
-             --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr        \
+            --enable-thread-safe \
+            --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
 
     <para>Compile the package:</para>
 
diff --git a/chapter06/xz.xml b/chapter06/xz.xml
index c90409a16..67594d2d4 100644
--- a/chapter06/xz.xml
+++ b/chapter06/xz.xml
@@ -6,10 +6,10 @@
 ]>
 
 <sect1 id="ch-system-xz" role="wrap">
-  <?dbhtml filename="xz-utils.html"?>
+  <?dbhtml filename="xz.html"?>
 
   <sect1info condition="script">
-    <productname>xz-utils</productname>
+    <productname>xz</productname>
     <productnumber>&xz-version;</productnumber>
     <address>&xz-url;</address>
   </sect1info>
diff --git a/patches.ent b/patches.ent
index 9294ff8de..cb833999e 100644
--- a/patches.ent
+++ b/patches.ent
@@ -14,6 +14,10 @@
 <!ENTITY coreutils-i18n-patch-md5 "54c99871cd0ca20f29bdc9462e27f0df">
 <!ENTITY coreutils-i18n-patch-size "140 KB">
 
+<!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
+<!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
+<!ENTITY glibc-fhs-patch-size "2.8 KB">
+
 <!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">