Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
+++ introduction/welcome/changelog.xml	(revision 54789f31d34fd77aa54f9cdc50c43a5d4f0c02da)
@@ -80,4 +80,31 @@
           <para>[renodr] - Update to GnuTLS-3.4.8. Merged from trunk r16797.</para>
         </listitem>
+        <listitem>
+          <para>[renodr] - Update to LVM-2.02.420. Merged from trunk r16816.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to Fuse-2.9.5. Merged from trunk r16814.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gptfdisk-1.0.1. Merged from trunk r16553.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to xfsprogs-4.3.0. Merged from trunk r16376.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to JOE-4.1. Merged from trunk r16385.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to nano-2.5.1. Merged from trunk r16799.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to tcsh-6.19.00. Merged from trunk r16332.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to zsh-5.2. Merged from trunk r16706.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to qemu-2.5.0. Merged from trunk r16773.</para>
+        </listitem>
       </itemizedlist>
    </listitem>
Index: packages.ent
===================================================================
--- packages.ent	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
+++ packages.ent	(revision 54789f31d34fd77aa54f9cdc50c43a5d4f0c02da)
@@ -40,14 +40,15 @@
 
 <!-- Chapter 5 -->
-<!ENTITY fuse-version                 "2.9.4">
+<!ENTITY fuse-version                 "2.9.5">
+<!ENTITY fuse-download-version        "2_9_5">
 <!ENTITY jfsutils-version             "1.1.15">
-<!ENTITY lvm2-version                 "2.02.128">
+<!ENTITY lvm2-version                 "2.02.140">
 <!ENTITY mdadm-version                "3.3.4">
 <!ENTITY ntfs-3g-version              "2015.3.14">
-<!ENTITY gptfdisk-version             "1.0.0">
+<!ENTITY gptfdisk-version             "1.0.1">
 <!ENTITY parted-version               "3.2">
 <!ENTITY reiser-version               "3.6.24">
 <!ENTITY sshfs-fuse-version           "2.5">
-<!ENTITY xfsprogs-version             "3.2.4">
+<!ENTITY xfsprogs-version             "4.3.0">
 
 <!-- Chapter 6 -->
@@ -55,15 +56,15 @@
 <!ENTITY ed-version                   "1.12">
 <!ENTITY emacs-version                "24.5">
-<!ENTITY joe-version                  "4.0">
-<!ENTITY nano-version                 "2.4.2">
+<!ENTITY joe-version                  "4.1">
+<!ENTITY nano-version                 "2.5.1">
 <!ENTITY vim-version                  "7.4">
 
 <!-- Chapter 7 -->
 <!ENTITY dash-version                 "0.5.8">
-<!ENTITY tcsh-version                 "6.18.01">
-<!ENTITY zsh-version                  "5.0.8">
+<!ENTITY tcsh-version                 "6.19.00">
+<!ENTITY zsh-version                  "5.2">
 
 <!-- Chapter 8 Virtualization -->
-<!ENTITY qemu-version                 "2.3.0">
+<!ENTITY qemu-version                 "2.5.0">
 
 <!-- Part III -->
Index: postlfs/editors/joe.xml
===================================================================
--- postlfs/editors/joe.xml	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
+++ postlfs/editors/joe.xml	(revision 54789f31d34fd77aa54f9cdc50c43a5d4f0c02da)
@@ -7,7 +7,7 @@
   <!ENTITY joe-download-http "&sourceforge-repo;/joe-editor/joe-&joe-version;.tar.gz">
   <!ENTITY joe-download-ftp  "&gentoo-ftp-repo;/joe-&joe-version;.tar.gz">
-  <!ENTITY joe-md5sum        "3c3b6d5089a29ddc746ee89bab59286e">
-  <!ENTITY joe-size          "820 KB">
-  <!ENTITY joe-buildsize     "12 MB">
+  <!ENTITY joe-md5sum        "b8c9ab4295e3208ddbbaa9c1141564f9">
+  <!ENTITY joe-size          "1.3 MB">
+  <!ENTITY joe-buildsize     "20 MB">
   <!ENTITY joe-time          "0.2 SBU">
 ]>
@@ -78,5 +78,9 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install &amp;&amp;
+
+install -vm 755 joe/util/{stringify,termidx,uniproc} /usr/bin &amp;&amp;
+install -vdm755 /usr/share/joe/util &amp;&amp;
+install -vm 644 joe/util/{*.txt,README} /usr/share/joe/util</userinput></screen>
 
   </sect2>
@@ -134,10 +138,12 @@
              jpico, 
              jstar, 
-             rjoe, and 
-             termidx</seg>
+             rjoe, 
+             stringify,
+             termidx, and 
+             uniproc</seg>
         <seg>None</seg>
         <seg>/etc/joe, 
              /usr/share/joe, and 
-             /usr/share/doc/joe</seg>
+             /usr/share/doc/joe-&joe-version;</seg>
       </seglistitem>
     </segmentedlist>
@@ -205,9 +211,20 @@
       </varlistentry>
 
+      <varlistentry id="stringify">
+        <term><command>stringify</command></term>
+        <listitem>
+          <para>is a program used by <command>joe</command> to convert rc and
+          .jsf files into a C file (see /usr/share/joe/util/README).</para>
+          <indexterm zone="joe stringify">
+            <primary sortas="b-stringify">stringify</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="termidx">
         <term><command>termidx</command></term>
         <listitem>
           <para>is a program used by <command>joe</command> to generate the
-          termcap index file.</para>
+          termcap index file (see /usr/share/joe/util/README).</para>
           <indexterm zone="joe termidx">
             <primary sortas="b-termidx">termidx</primary>
@@ -216,4 +233,16 @@
       </varlistentry>
 
+      <varlistentry id="uniproc">
+        <term><command>uniproc</command></term>
+        <listitem>
+          <para>is a program used by <command>joe</command> to generate joe's
+          unicode database file unicat.c from Blocks.txt, CaseFolding.txt,
+          EastAsianWidth.txt, and UnicodeData.txt (find them at
+          /usr/share/joe/util; see /usr/share/joe/util/README).</para>
+          <indexterm zone="joe uniproc">
+            <primary sortas="b-uniproc">uniproc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry> 
     </variablelist>
 
Index: postlfs/editors/nano.xml
===================================================================
--- postlfs/editors/nano.xml	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
+++ postlfs/editors/nano.xml	(revision 54789f31d34fd77aa54f9cdc50c43a5d4f0c02da)
@@ -7,8 +7,8 @@
   <!ENTITY nano-download-http "http://ftp.gnu.org/gnu/nano/nano-&nano-version;.tar.gz">
   <!ENTITY nano-download-ftp  "ftp://ftp.gnu.org/gnu/nano/nano-&nano-version;.tar.gz">
-  <!ENTITY nano-md5sum        "ce6968992fec4283c17984b53554168b">
-  <!ENTITY nano-size          "1.8 MB">
-  <!ENTITY nano-buildsize     "11 MB">
-  <!ENTITY nano-time          "less than 0.1 SBU">
+  <!ENTITY nano-md5sum        "f25c7da9813ae5f1df7e5dd1072de4ce">
+  <!ENTITY nano-size          "1.9 MB">
+  <!ENTITY nano-buildsize     "13 MB">
+  <!ENTITY nano-time          "0.1 SBU">
 ]>
 
@@ -171,4 +171,13 @@
       </para>
 
+      <para>
+        Syntax highlighting is provided for several file types, in the
+        <filename class="directory">/usr/share/nano/</filename> directory.
+        As an example, for shell scripts, you can insert
+        <option>include /usr/share/nano/sh.nanorc</option> in your personal
+        or global configuration file. If you want highlighting for all supported
+        files, use <option>include /usr/share/nano/*.nanorc</option>.
+      </para>
+
     </sect3>
 
@@ -185,5 +194,6 @@
       <seglistitem>
         <seg>
-          nano and rnano (symlink)
+          nano 
+          and rnano (symlink)
         </seg>
         <seg>
Index: postlfs/filesystems/fuse.xml
===================================================================
--- postlfs/filesystems/fuse.xml	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
+++ postlfs/filesystems/fuse.xml	(revision 54789f31d34fd77aa54f9cdc50c43a5d4f0c02da)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY fuse-download-http "&sourceforge-repo;/fuse/fuse-&fuse-version;.tar.gz">
+  <!ENTITY fuse-download-http "https://github.com/libfuse/libfuse/releases/download/fuse_&fuse-download-version;/fuse-&fuse-version;.tar.gz">
   <!ENTITY fuse-download-ftp  " ">
-  <!ENTITY fuse-md5sum        "ecb712b5ffc6dffd54f4a405c9b372d8">
-  <!ENTITY fuse-size          "564 KB">
-  <!ENTITY fuse-buildsize     "9.9 MB">
+  <!ENTITY fuse-md5sum        "c901b77a1c4584c7ac6c2b67c0713f2b">
+  <!ENTITY fuse-size          "552 KB">
+  <!ENTITY fuse-buildsize     "8.2 MB (9.8 MB with API documentation">
   <!ENTITY fuse-time          "0.1 SBU">
 ]>
@@ -123,5 +123,9 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static INIT_D_PATH=/tmp/init.d &amp;&amp;
+<screen><userinput>sed -i 's/2:9:4/2:9:5/' lib/Makefile.in &amp;&amp;
+
+./configure --prefix=/usr \
+            --disable-static \
+            INIT_D_PATH=/tmp/init.d &amp;&amp;
 make</userinput></screen>
 
@@ -142,5 +146,5 @@
 
 mv -v   /usr/lib/libfuse.so.* /lib &amp;&amp;
-ln -sfv ../../lib/$(readlink /usr/lib/libfuse.so) /usr/lib/libfuse.so &amp;&amp;
+ln -sfv ../../lib/libfuse.so.&fuse-version; /usr/lib/libfuse.so &amp;&amp;
 rm -rf  /tmp/init.d &amp;&amp;
 
@@ -162,4 +166,8 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para><command>sed -i ... lib/Makefile.in</command> This command fixes
+    the libfuse so version.
+    </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -232,11 +240,15 @@
       <seglistitem>
         <seg>
-          fusermount, mount.fuse, and ulockmgr_server
+          fusermount, 
+          mount.fuse, 
+          and ulockmgr_server
         </seg>
         <seg>
-          libfuse.so and libulockmgr.so
+          libfuse.so 
+          and libulockmgr.so
         </seg>
         <seg>
-          /usr/include/fuse and /usr/share/doc/fuse-&fuse-version;
+          /usr/include/fuse 
+          and /usr/share/doc/fuse-&fuse-version;
         </seg>
       </seglistitem>
Index: postlfs/filesystems/gptfdisk.xml
===================================================================
--- postlfs/filesystems/gptfdisk.xml	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
+++ postlfs/filesystems/gptfdisk.xml	(revision 54789f31d34fd77aa54f9cdc50c43a5d4f0c02da)
@@ -8,7 +8,7 @@
     "&sourceforge-repo;/project/gptfdisk/gptfdisk/&gptfdisk-version;/gptfdisk-&gptfdisk-version;.tar.gz">
   <!ENTITY gptfdisk-download-ftp  " ">
-  <!ENTITY gptfdisk-md5sum        "2061f917af084215898d4fea04d8388f">
+  <!ENTITY gptfdisk-md5sum        "d7f3d306b083123bcc6f5941efade586">
   <!ENTITY gptfdisk-size          "192 KB">
-  <!ENTITY gptfdisk-buildsize     "2.1 MB">
+  <!ENTITY gptfdisk-buildsize     "2.2 MB">
   <!ENTITY gptfdisk-time          "less than 0.1 SBU">
 ]>
@@ -133,5 +133,8 @@
       <seglistitem>
         <seg>
-          cgdisk, gdisk, fixparts, and sgdisk
+          cgdisk, 
+          gdisk, 
+          fixparts, 
+          and sgdisk
         </seg>
       </seglistitem>
Index: postlfs/filesystems/lvm2.xml
===================================================================
--- postlfs/filesystems/lvm2.xml	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
+++ postlfs/filesystems/lvm2.xml	(revision 54789f31d34fd77aa54f9cdc50c43a5d4f0c02da)
@@ -6,9 +6,9 @@
 
   <!ENTITY lvm2-download-http " ">
-  <!ENTITY lvm2-download-ftp  "ftp://sources.redhat.com/pub/lvm2/LVM2.&lvm2-version;.tgz">
-  <!ENTITY lvm2-md5sum        "b3f4c273a30b316678755cec2a129718">
+  <!ENTITY lvm2-download-ftp  "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.&lvm2-version;.tgz">
+  <!ENTITY lvm2-md5sum        "f2191c4798c8927a6d31a96010b9f568">
   <!ENTITY lvm2-size          "1.8 MB">
-  <!ENTITY lvm2-buildsize     "31 MB (additional 10 MB to run the test suite)">
-  <!ENTITY lvm2-time          "0.6 SBU (additional 8.2 SBU to run the test suite)">
+  <!ENTITY lvm2-buildsize     "46 MB (during the test suite, transient files can grow up to around 500 MB)">
+  <!ENTITY lvm2-time          "0.4 SBU (additional about 10 SBU to run the test suite with parallelism = 4)">
 ]>
 
@@ -31,8 +31,8 @@
 
     <para>
-      The <application>LVM2</application> package is a package that manages
+      The <application>LVM2</application> package is a set of utilities that manages
       logical partitions. It allows spanning of file systems across multiple
       physical disks and disk partitions and provides for dynamic growing or
-      shrinking of logical partitions.
+      shrinking of logical partitions, mirroring and low storage footprint snapshots.
     </para>
 
@@ -77,6 +77,12 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend='mdadm'/> (for checks) and
-      <xref linkend='xfsprogs'/> (for checks)
+      <xref linkend='mdadm'/> (for checks),
+      <xref linkend='reiserfs'/>,
+      <xref linkend='valgrind'/>,
+      <xref linkend='which'/>,
+      <xref linkend='xfsprogs'/> (all five may be used, but are not required, 
+        for tests), and
+      <ulink url='https://github.com/jthornber/thin-provisioning-tools'>
+        thin-provisioning-tools</ulink>
     </para>
 
@@ -84,4 +90,15 @@
       <ulink url="&blfs-wiki;/lvm2"/>
     </para>
+
+    <note>
+      <para>
+         Kernel versions in the 4.1 and 4.2 series have a broken RAID
+         implementation. If you want to use RAID style LV's, you should
+         install a kernel with a version number above 4.2.4. Note that several
+         tests use RAID logical volumes, and can generate a <quote>kernel
+         oops</quote> with faulty kernel versions, which usually renders the
+         system unusable.
+      </para>
+    </note>
   </sect2>
 
@@ -105,4 +122,5 @@
     &lt;*/M/ &gt;   Crypt target support                        [CONFIG_DM_CRYPT]
     &lt;*/M/ &gt;   Snapshot target                             [CONFIG_DM_SNAPSHOT]
+    &lt;*/M/ &gt;   Thin provisioning target                    [CONFIG_DM_THIN_PROVISIONING]
     &lt;*/M/ &gt;   Mirror target                               [CONFIG_DM_MIRROR]</literal></screen>
 
@@ -121,5 +139,7 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr       \
+<screen><userinput>SAVEPATH=$PATH         &amp;&amp;
+PATH=$PATH:/sbin:/usr/sbin                &amp;&amp;
+./configure --prefix=/usr       \
             --exec-prefix=      \
             --with-confdir=/etc \
@@ -128,15 +148,57 @@
             --enable-pkgconfig  \
             --enable-udev_sync  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      <!--The check command must be run as the <systemitem
-      class="username">root</systemitem> user.  Also the tests are known to
-      hang if at least one partition on a hard drive is not set up as a Linux
-      LVM partition (type 8e00).-->To test the results, issue: <command>make -k
-      check</command> as the <systemitem class="username">root</systemitem>
-      user. At least one partition on a hard drive must be set up as a Linux
-      LVM partition (type 8e00). The test timings are very dependent on the
-      speed of the disk(s) and on the number of enabled kernel options.
+make                            &amp;&amp;
+PATH=$SAVEPATH                  &amp;&amp;
+unset SAVEPATH</userinput></screen>
+
+    <para>
+      The tests use <application>udev</application> for logical volume
+      synchronization, so the LVM udev rules and some utilities need to
+      be installed before running the tests. If you are installing
+      <application>LVM2</application> for the first time, and do not
+      want to install the full package before running the tests, the minimal
+      set of utilities can be installed by running the following commands
+      as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make -C tools install_dmsetup_dynamic &amp;&amp;
+make -C udev install             &amp;&amp;
+make -C libdm install</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check_local</command> as the
+      <systemitem class="username">root</systemitem> user. Other targets are
+      available and can be listed with <command>make -C test help</command>.
+      The test timings are very dependent on the speed of the disk(s), and on
+      the number of enabled kernel options.
+    </para>
+    <para>
+      Those tests do not implement the <quote>expected fail</quote> possibility,
+      and a small number of test failures is expected by upstream. More
+      failures may happen because some kernel options are missing. For example,
+      the lack of the <emphasis>dm-delay</emphasis> device mapper target may
+      explain up to 10 failures or so. Some tests are flagged
+      <quote>warned</quote> if
+      <ulink url='https://github.com/jthornber/thin-provisioning-tools'>
+      thin-provisioning-tools</ulink> are not installed. A workaround is to
+      add the following flags to <command>configure</command>:
+    </para>
+
+<screen role="nodump"><userinput>      --with-thin-check=   \
+     --with-thin-dump=     \
+     --with-thin-repair=   \
+     --with-thin-restore=  \
+     --with-cache-check=   \
+     --with-cache-dump=    \
+     --with-cache-repair=  \
+     --with-cache-restore= \</userinput></screen>
+
+    <para>
+      Some tests may hang with kernel versions within the 4.1 and 4.2 series (see
+      above). They can be removed if necessary, for example: <command>rm
+      test/shell/lvcreate-large-raid.sh</command>. The tests generate a lot
+      of kernel messages, which may clutter your terminal. You can disable them
+      by issuing <command>dmesg -D</command> before running the tests (do not
+      forget to issue <command>dmesg -E</command> when the tests are done).
     </para>
 
@@ -151,4 +213,12 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <command>PATH=$PATH:/sbin:/usr/sbin</command>: The path
+      must contain <filename class="directory">/sbin</filename> and
+      <filename class="directory">/usr/sbin</filename> for proper system tool
+      detection by the <command>configure</command> script. This command
+      ensures that it is properly set if you are building as an unprivileged user.
+    </para>
 
     <para>
@@ -161,4 +231,11 @@
       building of the shared command library. It is required
       when building the event daemon.
+    </para>
+    
+    <para>
+      <option>--enable-lvmetad</option>: This switch enables
+      building of the <application>LVM</application> metadata daemon,
+      which avoids scanning all the filesystems when an LVM command is
+      run.
     </para>
 
@@ -191,13 +268,26 @@
       <seglistitem>
         <seg>
-          blkdeactivate, dmeventd (optional), dmsetup, fsadm, lvm, lvmconf,
-          lvmdump, and vgimportclone. There are also numerous symbolic links to
+          blkdeactivate, 
+          dmeventd (optional), 
+          dmsetup, 
+          fsadm, 
+          lvm, 
+          lvmconf,
+          lvmdump, 
+          lvmetad (optional), 
+          and vgimportclone. 
+          There are also numerous symbolic links to
           lvm that implement specific functionalities
         </seg>
         <seg>
-          libdevmapper.so, liblvm2app.so and liblvm2cmd.so; optional:
-          libdevmapper-event.so, libdevmapper-event-lvm2.so,
-          libdevmapper-event-lvm2mirror.so, libdevmapper-event-lvm2snapshot.so,
-          libdevmapper-event-lvm2raid.so, and libdevmapper-event-lvm2thin.so
+          libdevmapper.so, 
+          liblvm2app.so, 
+          and liblvm2cmd.so; 
+          optional: libdevmapper-event.so, 
+          libdevmapper-event-lvm2.so,
+          libdevmapper-event-lvm2mirror.so, 
+          libdevmapper-event-lvm2snapshot.so,
+          libdevmapper-event-lvm2raid.so, 
+          and libdevmapper-event-lvm2thin.so
         </seg>
         <seg>
@@ -303,4 +393,16 @@
       </varlistentry>
 
+      <varlistentry id="lvmetad">
+        <term><command>lvmetad</command></term>
+        <listitem>
+          <para>
+            (optional) is the LVM metadata daemon.
+          </para>
+          <indexterm zone="lvm2 lvmetad">
+            <primary sortas="b-lvmetad">lvmetad</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="vgimportclone">
         <term><command>vgimportclone</command></term>
Index: postlfs/filesystems/xfsprogs.xml
===================================================================
--- postlfs/filesystems/xfsprogs.xml	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
+++ postlfs/filesystems/xfsprogs.xml	(revision 54789f31d34fd77aa54f9cdc50c43a5d4f0c02da)
@@ -8,8 +8,8 @@
   <!ENTITY xfsprogs-download-http " ">
   <!ENTITY xfsprogs-download-ftp  "ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsprogs-&xfsprogs-version;.tar.gz">
-  <!ENTITY xfsprogs-md5sum        "c28db88f058ada506fe0ac6a897a1c42">
-  <!ENTITY xfsprogs-size          "1.4 MB">
-  <!ENTITY xfsprogs-buildsize     "34 MB">
-  <!ENTITY xfsprogs-time          "0.6 SBU">
+  <!ENTITY xfsprogs-md5sum        "ade22791338fa3d2cf442d6bb84f1748">
+  <!ENTITY xfsprogs-size          "1.5 MB">
+  <!ENTITY xfsprogs-buildsize     "63 MB">
+  <!ENTITY xfsprogs-time          "0.5 SBU">
 ]>
 
@@ -133,8 +133,24 @@
 
       <seglistitem>
-        <seg>fsck.xfs, mkfs.xfs, xfs_admin, xfs_bmap, xfs_copy, xfs_db,
-        xfs_estimate, xfs_freeze, xfs_fsr, xfs_growfs, xfs_info, xfs_io,
-        xfs_logprint, xfs_mdrestore, xfs_metadump, xfs_mkfile, xfs_ncheck,
-        xfs_quota, xfs_repair, and xfs_rtcp</seg>
+        <seg>fsck.xfs, 
+             mkfs.xfs, 
+             xfs_admin, 
+             xfs_bmap, 
+             xfs_copy, 
+             xfs_db,
+             xfs_estimate, 
+             xfs_freeze, 
+             xfs_fsr, 
+             xfs_growfs, 
+             xfs_info, 
+             xfs_io,
+             xfs_logprint, 
+             xfs_mdrestore, 
+             xfs_metadump, 
+             xfs_mkfile, 
+             xfs_ncheck,
+             xfs_quota, 
+             xfs_repair, 
+             and xfs_rtcp</seg>
         <seg>libhandle.so</seg>
         <seg>/usr/include/xfs and /usr/share/doc/xfsprogs-&xfsprogs-version;</seg>
Index: postlfs/shells/tcsh.xml
===================================================================
--- postlfs/shells/tcsh.xml	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
+++ postlfs/shells/tcsh.xml	(revision 54789f31d34fd77aa54f9cdc50c43a5d4f0c02da)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY tcsh-download-http "http://www.sfr-fresh.com/unix/misc/tcsh-&tcsh-version;.tar.gz">
+  <!ENTITY tcsh-download-http "http://fossies.org/linux/misc/tcsh-&tcsh-version;.tar.gz">
   <!ENTITY tcsh-download-ftp  "ftp://ftp.astron.com/pub/tcsh/tcsh-&tcsh-version;.tar.gz">
-  <!ENTITY tcsh-md5sum        "6eed09dbd4223ab5b6955378450d228a">
-  <!ENTITY tcsh-size          "912 KB">
-  <!ENTITY tcsh-buildsize     "12.6 MB">
-  <!ENTITY tcsh-time          "0.2 SBU">
+  <!ENTITY tcsh-md5sum        "f5f854833578647795bc906dd4bcb5d5">
+  <!ENTITY tcsh-size          "928 KB">
+  <!ENTITY tcsh-buildsize     "15 MB (with tests)">
+  <!ENTITY tcsh-time          "0.2 SBU (with tests)">
 ]>
 
@@ -68,9 +68,18 @@
   <sect2 role="installation">
     <title>Installation of Tcsh</title>
+    
+    <para>
+      First, fix the package for gcc5 optimizations:
+    </para>
+
+<screen><userinput>sed -e 's/ i)/ k)/' \
+     -e '/ k)/ i \   k = i;' \
+     -e '/\*cp/ a \  volatile size_t k;' \
+     -i tc.alloc.c</userinput></screen>
 
     <para>Install <application>Tcsh</application> by running the following
     commands:</para>
 
-<screen><userinput>sed -i -e 's|\$\*|#&amp;|' -e 's|fR/g|&amp;m|' tcsh.man2html &amp;&amp;
+<screen><userinput>sed -i 's|fR/g|&amp;m|' tcsh.man2html &amp;&amp;
 
 ./configure --prefix=/usr --bindir=/bin &amp;&amp;
@@ -94,5 +103,5 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -i -e 's|\$\*|#&amp;|' -e 's|fR/g|&amp;m|' tcsh.man2html</command>:
+    <para><command>sed -i 's|fR/g|&amp;m|' tcsh.man2html</command>:
     This updates some deprecated Perl code.</para>
 
@@ -175,4 +184,46 @@
 <literal>/bin/tcsh
 /bin/csh</literal>
+EOF</userinput></screen>
+
+      <para>
+        The following <filename>~/.cshrc</filename> provides two alternative
+        colour prompts and coloured <command>ls</command> output. If you prefer
+        a global modification, issue the command as the
+        <systemitem class="username">root</systemitem> user, replacing
+        <filename>~/.cshrc</filename> by <filename>/etc/csh.cshrc</filename>.
+      </para>
+
+<screen><userinput>cat &gt; ~/.cshrc &lt;&lt; "EOF"
+<literal># Original at:
+# https://www.cs.umd.edu/~srhuang/teaching/code_snippets/prompt_color.tcsh.html
+
+# Modified by the BLFS Development Team.
+
+# Add these lines to your ~/.cshrc (or to /etc/csh.cshrc).
+
+# Colors!
+set      red="%{\033[1;31m%}"
+set    green="%{\033[0;32m%}"
+set   yellow="%{\033[1;33m%}"
+set     blue="%{\033[1;34m%}"
+set  magenta="%{\033[1;35m%}"
+set     cyan="%{\033[1;36m%}"
+set    white="%{\033[0;37m%}"
+set      end="%{\033[0m%}" # This is needed at the end...
+
+# Setting the actual prompt. Two separate versions are available for you to try. Pick
+# whichever one you like better, and change the colors as you want.
+# Just don't mess with the ${end} guy in either line... Comment out or
+# delete the prompt that you don't use.
+
+set prompt="${green}%n${blue}@%m ${white}%~ ${green}%%${end} "
+set prompt="[${green}%n${blue}@%m ${white}%~ ]${end} "
+
+# This was not in the original URL above.
+# Provides coloured ls
+alias ls ls --color=always
+
+# Clean up after ourselves...
+unset red green yellow blue magenta cyan yellow white end</literal>
 EOF</userinput></screen>
 
Index: postlfs/shells/zsh.xml
===================================================================
--- postlfs/shells/zsh.xml	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
+++ postlfs/shells/zsh.xml	(revision 54789f31d34fd77aa54f9cdc50c43a5d4f0c02da)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY zsh-download-http "http://www.zsh.org/pub/zsh-&zsh-version;.tar.bz2">
+  <!ENTITY zsh-download-http "http://www.zsh.org/pub/zsh-&zsh-version;.tar.xz">
   <!ENTITY zsh-download-ftp  " ">
-  <!ENTITY zsh-md5sum        "e6759e8dd7b714d624feffd0a73ba0fe">
-  <!ENTITY zsh-size          "3.2 MB">
-  <!ENTITY zsh-buildsize     "66 MB">
-  <!ENTITY zsh-time          "1.1 SBU">
-
-  <!ENTITY zsh-doc-md5sum    "c49d1f0d2e7593c966461e0c1fa70532">
-  <!ENTITY zsh-doc-size      "3.1 MB">
+  <!ENTITY zsh-md5sum        "afe96fde08b70e23c1cab1ca7a68fb34">
+  <!ENTITY zsh-size          "2.7 MB">
+  <!ENTITY zsh-buildsize     "64 MB (includes documentation and tests)">
+  <!ENTITY zsh-time          "1.1 SBU (includes documentation and tests)">
+
+  <!ENTITY zsh-doc-md5sum    "873f1ade1fa5d0d15f9cba16d3ba5f98">
+  <!ENTITY zsh-doc-size      "3.0 MB">
 ]>
 
@@ -67,5 +67,5 @@
       <listitem>
         <para>Optional Documentation: <ulink
-        url="http://www.zsh.org/pub/zsh-&zsh-version;-doc.tar.bz2"/></para>
+        url="http://www.zsh.org/pub/zsh-&zsh-version;-doc.tar.xz"/></para>
       </listitem>
       <listitem>
@@ -76,4 +76,12 @@
       </listitem>
     </itemizedlist>
+
+    <note>
+      <para>
+        When there is a new <application>zsh</application> release available, the old
+        files shown above are moved to a new server directory:
+        <ulink url="http://www.zsh.org/pub/old/"/>
+      </para>
+    </note>
 
     <bridgehead renderas="sect3">zsh Dependencies</bridgehead>
@@ -97,5 +105,5 @@
     the following command:</para>
 
-<screen><userinput>tar --strip-components=1 -xvf ../zsh-&zsh-version;-doc.tar.bz2</userinput></screen>
+<screen><userinput>tar --strip-components=1 -xvf ../zsh-&zsh-version;-doc.tar.xz</userinput></screen>
 
 <!--    <note>
Index: postlfs/virtualization/qemu-systemd.xml
===================================================================
--- postlfs/virtualization/qemu-systemd.xml	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
+++ postlfs/virtualization/qemu-systemd.xml	(revision 54789f31d34fd77aa54f9cdc50c43a5d4f0c02da)
@@ -7,8 +7,8 @@
   <!ENTITY qemu-download-http "http://wiki.qemu.org/download/qemu-&qemu-version;.tar.bz2">
   <!ENTITY qemu-download-ftp  " ">
-  <!ENTITY qemu-md5sum        "2fab3ea4460de9b57192e5b8b311f221">
-  <!ENTITY qemu-size          "24 MB">
-  <!ENTITY qemu-buildsize     "291 MB">
-  <!ENTITY qemu-time          "1.4 SBU">
+  <!ENTITY qemu-md5sum        "f469f2330bbe76e3e39db10e9ac4f8db">
+  <!ENTITY qemu-size          "25 MB">
+  <!ENTITY qemu-buildsize     "419 MB (with tests)">
+  <!ENTITY qemu-time          "2.4 SBU (with tests)">
 ]>
 
@@ -79,11 +79,16 @@
       <xref linkend="curl"/>,
       <xref linkend="cyrus-sasl"/>,
+      <xref linkend="gnutls"/>,
       <xref linkend="gtk2"/>,
       <xref linkend="gtk3"/>,
       <xref linkend="libusb"/>,
+      <xref linkend="libgcrypt"/>,
       <xref linkend="lzo"/>,
+      <xref linkend="nettle"/>,
       <xref linkend="nss"/> (for libcacard.so),
-      <xref linkend="mesalib"/>, and
+      <xref linkend="mesalib"/>, 
+      <xref linkend="sdl"/>, and
       <xref linkend="vte"/>
+      <ulink url="http://www.libssh2.org">libssh2</ulink>
     </para>
 
@@ -151,16 +156,37 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --docdir=/usr/share/doc/qemu-&qemu-version; \
-            --target-list=x86_64-softmmu &amp;&amp;
+      <note><para>Qemu is capable of running many targets. The build process
+      is also capable of building multiple targets at one time in a
+      comma delimited list assigned to <option>--target-list</option>. Run
+      <command>./configure --help</command> to get a complete list of
+      available targets.</para></note>
+
+<screen><userinput>if [ $(uname -m) = i686 ]; then
+   QEMU_ARCH=i386-softmmu
+else
+   QEMU_ARCH=x86_64-softmmu
+fi
+
+mkdir -vp build &amp;&amp;
+cd        build &amp;&amp;
+
+../configure --prefix=/usr          \
+             --sysconfdir=/etc   \
+             --target-list=$QEMU_ARCH  \
+             --audio-drv-list=alsa     \
+             --docdir=/usr/share/doc/qemu-&qemu-version; &amp;&amp;
+
+unset QEMU_ARCH &amp;&amp;
+
 make</userinput></screen>
 
-    <para>To run the built in tests, run <command>make V=1 check</command>.</para>
+    <para>To run the built in tests, run <command>make V=1 check</command>.
+    One test is known to fail.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install &amp;&amp;
-[ -e  /usr/lib/libcacard.so ] &amp;&amp; chmod -v 755 /usr/lib/libcacard.so</userinput></screen>
+[ -e  /usr/lib/libcacard.so ] &amp;&amp;
+chmod -v 755 /usr/lib/libcacard.so</userinput></screen>
 
     <para>
@@ -193,7 +219,7 @@
 
     <para>For convenience you may want to create a symbolic link to run
-    <command>qemu-system-x86_64</command>:</para>
-
-    <screen role="root"><userinput>ln -sv qemu-system-x86_64 /usr/bin/qemu</userinput></screen>
+    The installed program. For instance:</para>
+
+<screen role="root"><userinput>ln -sv qemu-system-`uname -m` /usr/bin/qemu</userinput></screen>
     </note>
 
@@ -203,11 +229,6 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--target-list=x86_64-softmmu</parameter>: This switch
-    limits the build target to the x86_64 architecture.  For other 
-    hardware emulation see the --target-list list in <command>configure</command>'s
-    help output.  Omitting this option will build all architectures.</para>
-
     <para>
-      <option>--audio-drv-list=alsa</option>: This switch sets the audio driver
+      <parameter>--audio-drv-list=alsa</parameter>: This switch sets the audio driver
       to ALSA. For other drivers see the --audio-drv-list list in
       <command>configure</command>'s help output. The default audio driver is
@@ -230,5 +251,6 @@
     <note><para>The following instructions assume you have created the optional
     symbolic link, <userinput>qemu</userinput>.  Additionally, you must run
-    <userinput>qemu</userinput> from an X Window System based terminal.</para></note>
+    <userinput>qemu</userinput> from an X Window System based terminal.
+    (either locally or over ssh).</para></note>
 
     <para>To install an operating system, download an iso of your choice or use
@@ -257,6 +279,76 @@
 <screen><userinput>qemu -enable-kvm vdisk.img -m 384</userinput></screen>
 
-    <para>To add networking to the instance add "-net nic -net user" to the
-    command above.  qemu provides a DHCP server for the VM and, depending on
+    <para>You may have a problem with <parameter>--enable-kvm</parameter>. Also,
+    you may want to define audio and video drivers, the number of cpu cores, and
+    the number of threads. An alternative command to install the operating system is (see qemu
+    man page for parameters definitions):</para>
+
+<screen><userinput>qemu -enable-kvm             \
+    -cdrom /home/fernando/ISO/linuxmint-17.1-mate-32bit.iso \
+    -boot order=d             \
+    -m 1G,slots=3,maxmem=4G \
+    -machine smm=off        \
+    -soundhw es1370         \
+    -cpu host               \
+    -smp cores=4,threads=2  \
+    -vga std                \
+    vdisk.img</userinput></screen>
+
+    <para>One parameter not appearing in the qemu man page is
+    <parameter>-machine smm=off</parameter>, and it used to allow
+    <parameter>-enable-kvm</parameter> in some systems. In order to run the
+    machine, you can alternatively issue:</para>
+
+<screen><userinput>qemu -enable-kvm          \
+    -machine smm=off             \
+    -boot order=d                \
+    -m 1G,slots=3,maxmem=4G      \
+    -soundhw es1370              \
+    -cpu host                    \
+    -smp cores=4,threads=2       \
+    -vga vmware                  \
+    -hda vdisk.img</userinput></screen>
+
+    <para>Sometimes, you want the machine to have different screen sizes than
+    the ones natively offered by the virtual graphics card. The example below is
+    for the qemu vmware graphics card, which uses
+    <xref linkend="xorg-vmware-driver"/> and is set to give the maximum screen size
+    of 1600x900. As the <systemitem class="username">root</systemitem> user,
+    issue the following:</para>
+
+<screen role="root"><userinput>cat &gt; /usr/share/X11/xorg.conf.d/20-vmware.conf &lt;&lt; "EOF"
+<literal>Section        "Monitor"
+   Identifier     "Monitor0"
+   # cvt 1600 900
+   # 1600x900 59.95 Hz (CVT 1.44M9) hsync:55.99 kHz; pclk: 118.25 MHz
+   Modeline       "1600x900" 118.25 1600 1696 1856 2112  900 903 908 934 -hysnc +vsync
+   Option         "PreferredMode" "1600x900"
+   HorizSync      1-200
+   VertRefresh    1-200
+EndSection
+
+Section           "Device"
+   Identifier     "VMWare SVGA II Adapter"
+   Option         "Monitor" "Default"
+   Driver         "vmware"
+EndSection
+
+Section           "Screen"
+   Identifier     "Default Screen"
+   Device         "VMWare SVGA II Adapter"
+   Monitor        "Monitor0"
+
+   SubSection     "Display"
+      Depth       24
+      Modes       "1600x900" "1440x900" "1366x768" "1280x720" "800x480"
+   EndSubSection
+EndSection </literal>
+EOF </userinput></screen>
+
+    <para>New sizes will be available besides the native ones. You need to
+    restart X in order to have the new sizes available.</para>
+
+    <para><!--To add networking to the instance add "-net nic -net user" to the
+    command above.--> qemu provides a DHCP server for the VM and, depending on
     the client system, sets up networking though the host.</para>
 
@@ -268,5 +360,5 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Set up bridging using <xref linkend="network-bridge"/>.</para>
+        <para>Set up bridging using <xref linkend="bridgeutils"/>.</para>
       </listitem>
 
@@ -375,9 +467,12 @@
       <seglistitem>
         <seg>
+          ivshmem-client,
+          ivshmem-server,
+          qemu (symlink),
           qemu-ga,
           qemu-img,
           qemu-io,
           qemu-nbd,
-          qemu-system-x86_64,
+          qemu-system-&lt;arch&gt;,
           virtfs-proxy-helper, and
           vscclient
@@ -385,8 +480,5 @@
         <seg>libcacard.so</seg>
         <seg>
-          /etc/qemu,
-          /usr/include/cacard,
-          /usr/lib/qemu,
-          /usr/share/qemu, and
+          /etc/qemu, and
           /usr/share/doc/qemu-&qemu-version;
         </seg>
