Index: general.ent
===================================================================
--- general.ent	(revision 31b8fd2630e3af38a83de8f1b1460a24f7d84437)
+++ general.ent	(revision 8b9ad6ea677ffc4b9d9b83bae979eabeef79f97d)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "15">                   <!-- Always 2 digits -->
+<!ENTITY day          "16">                   <!-- Always 2 digits -->
 <!ENTITY month        "08">                   <!-- Always 2 digits -->
 <!ENTITY year         "2015">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "August 15th &year;">
+<!ENTITY releasedate  "August 16th &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision 31b8fd2630e3af38a83de8f1b1460a24f7d84437)
+++ general/genutils/imagemagick.xml	(revision 8b9ad6ea677ffc4b9d9b83bae979eabeef79f97d)
@@ -9,8 +9,8 @@
   <!ENTITY imagemagick-download-http " ">
   <!ENTITY imagemagick-download-ftp "ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
-  <!ENTITY imagemagick-md5sum        "abd11cac6d0c064e68e331232c21f1d6">
-  <!ENTITY imagemagick-size          "7.6 MB">
-  <!ENTITY imagemagick-buildsize "171 MB (with typical dependencies, additional 33 MB to run the test suite, reputedly 450 MB with all dependencies)">
-  <!ENTITY imagemagick-time "2.2 SBU (typical build - additional 3.6 SBU to run the test suite and 4 SBU to run the validation suite)">
+  <!ENTITY imagemagick-md5sum        "99471c8c3f38c9264faf5c4ca7a31287">
+  <!ENTITY imagemagick-size          "7.9 MB">
+  <!ENTITY imagemagick-buildsize     "192 MB, with typical dependencies (227 MB with the test suite, reputedly 450 MB with all dependencies)">
+  <!ENTITY imagemagick-time          "2.2 SBU - typical build (additional 3.4 SBU to run the test suite and 3.3 SBU to run the validation suite)">
 ]>
 
@@ -315,7 +315,6 @@
         <seg>
           libMagickCore-6.Q16HDRI.so,
-          libMagickWand-6.Q16HDRI.so,
-          libMagick++-6.Q16HDRI.so, and
-          /usr/lib/perl5/site_perl/&lfs-perl-version;/auto/Image/Magick/{Magick,Q16HDRI/Q16HDRI}.so
+          libMagickWand-6.Q16HDRI.so and
+          libMagick++-6.Q16HDRI.so
         </seg>
         <seg>
Index: general/graphlib/libraw.xml
===================================================================
--- general/graphlib/libraw.xml	(revision 31b8fd2630e3af38a83de8f1b1460a24f7d84437)
+++ general/graphlib/libraw.xml	(revision 8b9ad6ea677ffc4b9d9b83bae979eabeef79f97d)
@@ -7,7 +7,7 @@
   <!ENTITY libraw-download-http "http://www.libraw.org/data/LibRaw-&libraw-version;.tar.gz">
   <!ENTITY libraw-download-ftp  " ">
-  <!ENTITY libraw-md5sum        "6e5d0998b2904f3787c296777293af58">
-  <!ENTITY libraw-size          "1.4 MB">
-  <!ENTITY libraw-buildsize     "16 MB">
+  <!ENTITY libraw-md5sum        "f6d2b9dd22e63ac0f0bd3944489a81c6">
+  <!ENTITY libraw-size          "1.5 MB">
+  <!ENTITY libraw-buildsize     "18 MB">
   <!ENTITY libraw-time          "0.2 SBU">
 ]>
@@ -32,5 +32,5 @@
     <para>
       <application>Libraw</application> is a library for reading RAW files
-      obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others). 
+      obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others).
     </para>
 
@@ -75,5 +75,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="libjpeg"/>, 
+      <xref linkend="libjpeg"/>,
       <xref linkend="jasper"/>, and
       <xref linkend="lcms2"/>
@@ -108,5 +108,5 @@
 
     <para>
-      This package does not come with a test suite. 
+      This package does not come with a test suite.
     </para>
 
@@ -127,5 +127,5 @@
       <xref linkend="libjpeg"/> installed.
     </para>
-  
+
     <para>
       <option>--enable-jasper</option>: This switch enables
@@ -133,5 +133,5 @@
       <xref linkend="jasper"/> installed.
     </para>
-  
+
     <para>
       <option>--enable-lcms</option>: This switch enables
@@ -139,5 +139,5 @@
       <xref linkend="lcms2"/> installed.
     </para>
-  
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
@@ -161,7 +161,7 @@
       <seglistitem>
         <seg>
-          4channels, dcraw_half, mem_image, postprocessing_benchmark, 
-          simple_dcraw, dcraw_emu, half_mt, multirender_test, raw-identify,
-          and unprocessed_raw
+          4channels, dcraw_emu, dcraw_half, half_mt, mem_image,
+          multirender_test, postprocessing_benchmark, raw-identify,
+          simple_dcraw, and unprocessed_raw
         </seg>
         <seg>
@@ -196,5 +196,5 @@
         <listitem>
           <para>
-            emulates "dcraw -h" (see <ulink 
+            emulates "dcraw -h" (see <ulink
             url="http://www.http://www.cybercom.net/~dcoffin/dcraw/dcraw.1.html">
             DCRAW manpage</ulink>).
@@ -210,5 +210,5 @@
         <listitem>
           <para>
-            emulates "dcraw [-4] [-6] [-e]" (see <ulink 
+            emulates "dcraw [-4] [-6] [-e]" (see <ulink
             url="http://www.http://www.cybercom.net/~dcoffin/dcraw/dcraw.1.html">
             DCRAW manpage</ulink>).
@@ -224,5 +224,5 @@
         <listitem>
           <para>
-            creates eight different renderings from one source file. 
+            creates eight different renderings from one source file.
             The first and fourth one should be identical.
           </para>
@@ -238,5 +238,5 @@
         <listitem>
           <para>
-            emulates call to "dcraw  [-D]  [-T] [-v] [-e] [-4]"  (see <ulink 
+            emulates call to "dcraw  [-D]  [-T] [-v] [-e] [-4]"  (see <ulink
             url="http://www.http://www.cybercom.net/~dcoffin/dcraw/dcraw.1.html">
             DCRAW manpage</ulink>).
@@ -252,5 +252,5 @@
         <listitem>
           <para>
-            is an almost complete dcraw emulator (see <ulink 
+            is an almost complete dcraw emulator (see <ulink
             url="http://www.http://www.cybercom.net/~dcoffin/dcraw/dcraw.1.html">
             DCRAW manpage</ulink>).
@@ -266,5 +266,5 @@
         <listitem>
           <para>
-            emulates call to "dcraw -h [-w] [-a] [-v]"  (see <ulink 
+            emulates call to "dcraw -h [-w] [-a] [-v]"  (see <ulink
             url="http://www.http://www.cybercom.net/~dcoffin/dcraw/dcraw.1.html">
             DCRAW manpage</ulink>).
@@ -280,5 +280,5 @@
         <listitem>
           <para>
-            creates eight different renderings from one source file. 
+            creates eight different renderings from one source file.
             The first and fourth one should be identical.
           </para>
@@ -293,5 +293,5 @@
         <listitem>
           <para>
-            emulates call to "dcraw -i [-v]"  (see <ulink 
+            emulates call to "dcraw -i [-v]"  (see <ulink
             url="http://www.http://www.cybercom.net/~dcoffin/dcraw/dcraw.1.html">
             DCRAW manpage</ulink>).
@@ -307,5 +307,5 @@
         <listitem>
           <para>
-            generates unprocessed raw image: with masked pixels and without 
+            generates unprocessed raw image: with masked pixels and without
             black subtraction.
           </para>
Index: general/prog/cmake.xml
===================================================================
--- general/prog/cmake.xml	(revision 31b8fd2630e3af38a83de8f1b1460a24f7d84437)
+++ general/prog/cmake.xml	(revision 8b9ad6ea677ffc4b9d9b83bae979eabeef79f97d)
@@ -7,5 +7,5 @@
   <!ENTITY cmake-download-http "http://www.cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz">
   <!ENTITY cmake-download-ftp  " ">
-  <!ENTITY cmake-md5sum        "b1d4823e3f74c961486d9f253da9825d">
+  <!ENTITY cmake-md5sum        "52638576f4e1e621fed6c3410d3a1b12">
   <!ENTITY cmake-size          "6.3 MB">
   <!ENTITY cmake-buildsize     "669 MB (with test suite and Qt5 <command>cmake-gui</command>)">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 31b8fd2630e3af38a83de8f1b1460a24f7d84437)
+++ introduction/welcome/changelog.xml	(revision 8b9ad6ea677ffc4b9d9b83bae979eabeef79f97d)
@@ -44,4 +44,29 @@
 
 -->
+
+      <listitem>
+        <para>August 16th, 2015</para>
+        <itemizedlist>
+          <listitem>
+            <para>[fernando] - Update to LibRaw-0.17.0.  Fixes
+            <ulink url="&blfs-ticket-root;6825">#6825</ulink>.</para>
+          </listitem>
+          <listitem>
+            <para>[fernando] - Update to ImageMagick-6.9.2-0.  Fixes
+            <ulink url="&blfs-ticket-root;6823">#6823</ulink>.</para>
+          </listitem>
+          <listitem>
+            <para>[fernando] - Update to thunderbird-38.2.0.  Fixes
+            <ulink url="&blfs-ticket-root;6822">#6822</ulink>.</para>
+          </listitem>
+          <listitem>
+            <para>[fernando] - Move "Configuring lxqt-common" from
+            "lxqt-common-0.9.1" to "lxqt-session-0.9.0" and rename it to
+            "Configuring lxqt-session", because "lxqt-config-session" is
+            installed there.  Fixes
+            <ulink url="&blfs-ticket-root;6819">#6819</ulink>.</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
 
       <listitem>
Index: lxqt/desktop/lxqt-common.xml
===================================================================
--- lxqt/desktop/lxqt-common.xml	(revision 31b8fd2630e3af38a83de8f1b1460a24f7d84437)
+++ lxqt/desktop/lxqt-common.xml	(revision 8b9ad6ea677ffc4b9d9b83bae979eabeef79f97d)
@@ -75,6 +75,6 @@
     <para role="required">
       <xref linkend="liblxqt"/>,
-      <xref linkend="openbox"/> (runtime - see
-      <quote>Configuring lxqt-common</quote> section, below)
+      <xref linkend="openbox"/> (runtime - may be replaced by another WM, e.g.
+      <xref linkend="xfwm4"/>),
       <xref linkend="qt5"/> built with <xref linkend="librsvg"/>, and
       <xref linkend="xdg-utils"/>
@@ -135,35 +135,4 @@
   </sect2>
 
-  <sect2 role="configuration">
-    <title>Configuring lxqt-common</title>
-
-    <para>
-      Window Managers other than <xref linkend="openbox"/> may be used, e.g.
-      <xref linkend="xfwm4"/>. Notice that <xref linkend="icewm"/> is not a
-      valid replacement. <application>Fluxbox</application> does work, although
-      in this context (with <xref linkend="lxqt-config"/>) <xref
-      linkend="openbox"/> is better.  The
-      <filename>/etc/xdg/lxqt/windowmanagers.conf</filename> comes with several
-      examples of Window Managers and the ones which are installed will appear
-      in a drop down list of <command>lxqt-config-session</command>. For the
-      ones not included in
-      <filename>/etc/xdg/lxqt/windowmanagers.conf</filename>, you can use the
-      <command>lxqt-config-session</command> "search" button, e.g. for <xref
-      linkend="fluxbox"/>, navigating through the file system untill you can
-      choose <command>fluxbox</command> . Alternatively, if you wish the Window
-      Manager of your choice to appear in the drop down list, include it in
-      <filename>/etc/xdg/lxqt/windowmanagers.conf</filename>. For <xref
-      linkend="fluxbox"/>, include the line
-    </para>
-
-<screen><userinput><literal>fluxbox/Name=Fluxbox</literal></userinput></screen>
-
-    <para>
-      and it will appear as an option in the drop down list. To change the WM,
-      after selecting it, you need to restart the session.
-    </para>
-
-  </sect2>
-
   <sect2 role="content">
     <title>Contents</title>
Index: lxqt/desktop/lxqt-session.xml
===================================================================
--- lxqt/desktop/lxqt-session.xml	(revision 31b8fd2630e3af38a83de8f1b1460a24f7d84437)
+++ lxqt/desktop/lxqt-session.xml	(revision 8b9ad6ea677ffc4b9d9b83bae979eabeef79f97d)
@@ -121,4 +121,35 @@
     <para>
       <command>sed ...</command>: Fixes the headers for KF5.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring lxqt-session</title>
+
+    <para>
+      Window Managers other than <xref linkend="openbox"/> may be used, e.g.
+      <xref linkend="xfwm4"/>. Notice that <xref linkend="icewm"/> is not a
+      valid replacement. <application>Fluxbox</application> does work, although
+      in this context (with <xref linkend="lxqt-config"/>) <xref
+      linkend="openbox"/> is better.  The
+      <filename>/etc/xdg/lxqt/windowmanagers.conf</filename> comes with several
+      examples of Window Managers and the ones which are installed will appear
+      in a drop down list of <command>lxqt-config-session</command>. For the
+      ones not included in
+      <filename>/etc/xdg/lxqt/windowmanagers.conf</filename>, you can use the
+      <command>lxqt-config-session</command> "search" button, e.g. for <xref
+      linkend="fluxbox"/>, navigating through the file system until you can
+      choose <command>fluxbox</command>. Alternatively, if you wish the Window
+      Manager of your choice to appear in the drop down list, include it in
+      <filename>/etc/xdg/lxqt/windowmanagers.conf</filename>. For <xref
+      linkend="fluxbox"/>, include the line
+    </para>
+
+<screen><userinput><literal>fluxbox/Name=Fluxbox</literal></userinput></screen>
+
+    <para>
+      and it will appear as an option in the drop down list. To change the WM,
+      after selecting it, you need to restart the session.
     </para>
 
Index: multimedia/videoutils/vlc.xml
===================================================================
--- multimedia/videoutils/vlc.xml	(revision 31b8fd2630e3af38a83de8f1b1460a24f7d84437)
+++ multimedia/videoutils/vlc.xml	(revision 8b9ad6ea677ffc4b9d9b83bae979eabeef79f97d)
@@ -33,8 +33,8 @@
     <para>
       <application>VLC</application> is a media player, streamer, and encoder.
-      It can play from many inputs, such as files, network streams, capture 
+      It can play from many inputs, such as files, network streams, capture
       devices, desktops, or DVD, SVCD, VCD, and audio CD. It can use most audio
-      and video codecs (MPEG 1/2/4, H264, VC-1, DivX, WMV, Vorbis, AC3, AAC, 
-      etc.), and it can also convert to different formats and/or send streams 
+      and video codecs (MPEG 1/2/4, H264, VC-1, DivX, WMV, Vorbis, AC3, AAC,
+      etc.), and it can also convert to different formats and/or send streams
       through the network.
     </para>
@@ -214,12 +214,17 @@
     </para>
 
-<screen><userinput>sed -i 's:libsmbclient.h:samba-4.0/&amp;:' modules/access/smb.c &amp;&amp;
-./bootstrap &amp;&amp;
-
-./configure --prefix=/usr        &amp;&amp;
-
-sed -i 's/luaL_optint/(int)&amp;eger/'         modules/lua/libs/{net,osd,volume}.c             &amp;&amp;
-sed -i 's/luaL_checkint(/(int)luaL_checkinteger(/' \
-       modules/lua/{demux,libs/{configuration,net,osd,playlist,stream,variables,volume}}.c &amp;&amp;
+<screen><userinput>sed -e 's:libsmbclient.h:samba-4.0/&amp;:' \
+    -i modules/access/smb.c &amp;&amp;
+
+./bootstrap                 &amp;&amp;
+
+./configure --prefix=/usr   &amp;&amp;
+
+sed -e 's/luaL_optint/(int)&amp;eger/' \
+    -i modules/lua/libs/{net,osd,volume}.c                   &amp;&amp;
+sed -e 's/luaL_checkint(/(int)luaL_checkinteger(/' \
+    -i  modules/lua/{demux,libs/{configuration,net,osd,playlist}}.c \
+        modules/lua/{demux,libs/{stream,variables,volume}}.c &amp;&amp;
+
 make</userinput></screen>
 
Index: networking/netprogs/nfs-utils.xml
===================================================================
--- networking/netprogs/nfs-utils.xml	(revision 31b8fd2630e3af38a83de8f1b1460a24f7d84437)
+++ networking/netprogs/nfs-utils.xml	(revision 8b9ad6ea677ffc4b9d9b83bae979eabeef79f97d)
@@ -387,5 +387,5 @@
 
       <varlistentry id="osd_login">
-        <term><command>osd_logint</command></term>
+        <term><command>osd_login</command></term>
         <listitem>
           <para>is a script that is a part of the autologin feature
Index: packages.ent
===================================================================
--- packages.ent	(revision 31b8fd2630e3af38a83de8f1b1460a24f7d84437)
+++ packages.ent	(revision 8b9ad6ea677ffc4b9d9b83bae979eabeef79f97d)
@@ -174,5 +174,5 @@
                                                        Required version in order to use
                                                        svg pixbuf loader. -->
-<!ENTITY libraw-version               "0.16.2">
+<!ENTITY libraw-version               "0.17.0">
 <!ENTITY libtiff-version              "4.0.4">
 <!ENTITY libwebp-version              "0.4.3">
@@ -195,5 +195,5 @@
 <!ENTITY hicolor-icon-theme-version   "0.15">
 <!ENTITY icon-naming-utils-version    "0.8.90">
-<!ENTITY imagemagick-version          "6.9.1">
+<!ENTITY imagemagick-version          "6.9.2">
 <!ENTITY intltool-version             "0.50.2">
 <!ENTITY lsof-version                 "4.89">
@@ -649,5 +649,5 @@
 <!ENTITY rox-filer-version            "2.11">
 <!ENTITY rxvt-unicode-version         "9.21">
-<!ENTITY thunderbird-version          "38.1.0">
+<!ENTITY thunderbird-version          "38.2.0">
 <!ENTITY tigervnc-version             "1.5.0">
 <!ENTITY transmission-version         "2.84">
Index: x/lib/fltk.xml
===================================================================
--- x/lib/fltk.xml	(revision 31b8fd2630e3af38a83de8f1b1460a24f7d84437)
+++ x/lib/fltk.xml	(revision 8b9ad6ea677ffc4b9d9b83bae979eabeef79f97d)
@@ -189,4 +189,27 @@
       <?dbhtml list-presentation="table"?>
 
+     <varlistentry id="blocks">
+        <term><command>blocks</command></term>
+        <listitem>
+          <para>
+            is a FLTK-based block elimination game.
+          </para>
+          <indexterm zone="fltk blocks">
+            <primary sortas="b-blocks">blocks</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="checkers">
+        <term><command>checkers</command></term>
+        <listitem>
+          <para>
+            is a FLTK-based version of the game of checkers.
+          </para>
+          <indexterm zone="fltk checkers">
+            <primary sortas="b-checkers">checkers</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
       <varlistentry id="fltk-config">
@@ -207,5 +230,5 @@
         <listitem>
           <para>
-            is  an  interactive GUI designer for FLTK.
+            is an interactive GUI designer for FLTK.
           </para>
           <indexterm zone="fltk fluid">
@@ -215,4 +238,16 @@
       </varlistentry>
 
+     <varlistentry id="sudoku">
+        <term><command>sudoku</command></term>
+        <listitem>
+          <para>
+            is an implementation of the popular Sudoku game.
+          </para>
+          <indexterm zone="fltk sudoku">
+            <primary sortas="b-sudoku">sudoku</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libfltk">
         <term><filename class="libraryfile">libfltk.so</filename></term>
Index: x/lib/gdk-pixbuf.xml
===================================================================
--- x/lib/gdk-pixbuf.xml	(revision 31b8fd2630e3af38a83de8f1b1460a24f7d84437)
+++ x/lib/gdk-pixbuf.xml	(revision 8b9ad6ea677ffc4b9d9b83bae979eabeef79f97d)
@@ -208,4 +208,16 @@
       </varlistentry>
 
+     <varlistentry id="gdk-pixbuf-pixdata">
+        <term><command>gdk-pixbuf-pixdata</command></term>
+        <listitem>
+          <para>
+            is a tool used to convert GdkPixbuf to GdkPixdata.
+          </para>
+          <indexterm zone="gdk-pixbuf gdk-pixbuf-pixdata">
+            <primary sortas="b-gdk-pixbuf-pixdata">gdk-pixbuf-pixdata</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="gdk-pixbuf-query-loaders">
         <term><command>gdk-pixbuf-query-loaders</command></term>
Index: x/lib/imlib2.xml
===================================================================
--- x/lib/imlib2.xml	(revision 31b8fd2630e3af38a83de8f1b1460a24f7d84437)
+++ x/lib/imlib2.xml	(revision 8b9ad6ea677ffc4b9d9b83bae979eabeef79f97d)
@@ -128,4 +128,53 @@
       <?dbhtml list-presentation="table"?>
 
+     <varlistentry id="imlib2_bumpmap">
+        <term><command>imlib2_bumpmap</command></term>
+        <listitem>
+          <para>
+            is to test the <application>imlib2</application> bumpmap function.
+          </para>
+          <indexterm zone="imlib2 imlib2_bumpmap">
+            <primary sortas="b-imlib2_bumpmap">imlib2_bumpmap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="imlib2_colorspace">
+        <term><command>imlib2_colorspace</command></term>
+        <listitem>
+          <para>
+            is to test the <application>imlib2</application> colorspace function.
+          </para>
+          <indexterm zone="imlib2 imlib2_colorspace">
+            <primary sortas="b-imlib2_colorspace">imlib2_colorspace</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="imlib2-config">
+        <term><command>imlib2-config</command></term>
+        <listitem>
+          <para>
+            is a script used to obtain <application>imlib2</application>
+            building informations.
+          </para>
+          <indexterm zone="imlib2 imlib2-config">
+            <primary sortas="b-imlib2-config">imlib2-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="imlib2_poly">
+        <term><command>imlib2_poly</command></term>
+        <listitem>
+          <para>
+            is to test the <application>imlib2</application> poly function.
+          </para>
+          <indexterm zone="imlib2 imlib2_poly">
+            <primary sortas="b-imlib2_poly">imlib2_poly</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="imlib2_conv">
         <term><command>imlib2_conv</command></term>
@@ -136,4 +185,40 @@
           <indexterm zone="imlib2 imlib2_conv">
             <primary sortas="b-imlib2_conv">imlib2_conv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="imlib2_grab">
+        <term><command>imlib2_grab</command></term>
+        <listitem>
+          <para>
+            take screenshots.
+          </para>
+          <indexterm zone="imlib2 imlib2_grab">
+            <primary sortas="b-imlib2_grab">imlib2_grab</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="imlib2_show">
+        <term><command>imlib2_show</command></term>
+        <listitem>
+          <para>
+           is an <application>imlib2</application> program test.
+          </para>
+          <indexterm zone="imlib2 imlib2_show">
+            <primary sortas="b-imlib2_show">imlib2_show</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="imlib2_test">
+        <term><command>imlib2_test</command></term>
+        <listitem>
+          <para>
+            is an <application>imlib2</application> program test.
+          </para>
+          <indexterm zone="imlib2 imlib2_test">
+            <primary sortas="b-imlib2_test">imlib2_test</primary>
           </indexterm>
         </listitem>
Index: x/lib/qt4.xml
===================================================================
--- x/lib/qt4.xml	(revision 31b8fd2630e3af38a83de8f1b1460a24f7d84437)
+++ x/lib/qt4.xml	(revision 8b9ad6ea677ffc4b9d9b83bae979eabeef79f97d)
@@ -643,4 +643,17 @@
       </varlistentry>
 
+      <varlistentry id="lconvert-qt4">
+        <term><command>lconvert</command></term>
+        <listitem>
+          <para>
+            is part of Qt4's Linguist tool chain. It can be used as a
+            standalone tool to convert and filter translation data files.
+          </para>
+          <indexterm zone="qt4 lconvert-qt4">
+            <primary sortas="b-lconvert-qt4">lconvert</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="linguist-qt4">
         <term><command>linguist</command></term>
@@ -709,4 +722,106 @@
       </varlistentry>
 
+     <varlistentry id="qcollectiongenerator-qt4">
+        <term><command>qcollectiongenerator</command></term>
+        <listitem>
+          <para>
+            is a tool used to create a Qt Help Collection.
+          </para>
+          <indexterm zone="qt4 qcollectiongenerator-qt4">
+            <primary sortas="b-qcollectiongenerator-qt4">qcollectiongenerator</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="qdbuscpp2xml-qt4">
+        <term><command>qdbuscpp2xml</command></term>
+        <listitem>
+          <para>
+            takes a C++ source file and generates a D-Bus XML definition
+            of the interface.
+          </para>
+          <indexterm zone="qt4 qdbuscpp2xml-qt4">
+            <primary sortas="b-qdbuscpp2xml-qt4">qdbuscpp2xml</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qdbus-qt4">
+        <term><command>qdbus</command></term>
+        <listitem>
+          <para>
+            lists available services, object paths,  methods, signals, and
+            properties of objects on a bus.
+          </para>
+          <indexterm zone="qt4 qdbus-qt4">
+            <primary sortas="b-qdbus-qt4">qdbus</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qdbusviewer-qt4">
+        <term><command>qdbusviewer</command></term>
+        <listitem>
+          <para>
+            is a graphical D-Bus browser.
+          </para>
+          <indexterm zone="qt4 qdbusviewer-qt4">
+            <primary sortas="b-qdbusviewer-qt4">qdbusviewer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qdbusxml2cpp-qt4">
+        <term><command>qdbusxml2cpp</command></term>
+        <listitem>
+          <para>
+            is a tool that can be used to parse interface descriptions
+            and produce static code representing those interfaces,
+          </para>
+          <indexterm zone="qt4 qdbusxml2cpp-qt4">
+            <primary sortas="b-qdbusxml2cpp-qt4">qdbusxml2cpp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qdoc3-qt4">
+        <term><command>qdoc3</command></term>
+        <listitem>
+          <para>
+            is a tool used by <application>Qt</application> Developers to
+            generate documentation for software projects.
+          </para>
+          <indexterm zone="qt4 qdoc3-qt4">
+            <primary sortas="b-qdoc3-qt4">qdoc3</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qhelpconverter-qt4">
+        <term><command>qhelpconverter</command></term>
+        <listitem>
+          <para>
+            is a tool used to convert files to <application>Qt</application>
+            help format.
+          </para>
+          <indexterm zone="qt4 qhelpconverter-qt4">
+            <primary sortas="b-qhelpconverter-qt4">qhelpconverter</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qhelpgenerator-qt4">
+        <term><command>qhelpgenerator</command></term>
+        <listitem>
+          <para>
+            is a tool used to generate a <application>Qt</application>
+            compressed help file.
+          </para>
+          <indexterm zone="qt4 qhelpgenerator-qt4">
+            <primary sortas="b-qhelpgenerator-qt4">qhelpgenerator</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="qmake-qt4">
         <term><command>qmake</command></term>
@@ -723,4 +838,29 @@
       </varlistentry>
 
+     <varlistentry id="qmlplugindump-qt4">
+        <term><command>qmlplugindump</command></term>
+        <listitem>
+          <para>
+            is a tool to create a qmltypes file.
+          </para>
+          <indexterm zone="qt4 qmlplugindump-qt4">
+            <primary sortas="b-qmlplugindump-qt4">qmlplugindump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qmlviewer-qt4">
+        <term><command>qmlviewer</command></term>
+        <listitem>
+          <para>
+            is a tool for loading QML documents that makes it easy to quickly
+            develop and debug QML applications.
+          </para>
+          <indexterm zone="qt4 qmlviewer-qt4">
+            <primary sortas="b-qmlviewer-qt4">qmlviewer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="qt3to4-qt4">
         <term><command>qt3to4</command></term>
@@ -743,4 +883,17 @@
           <indexterm zone="qt4 qtconfig-qt4">
             <primary sortas="b-qtconfig-qt4">qtconfig</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="qttracereplay">
+        <term><command>qttracereplay</command></term>
+        <listitem>
+          <para>
+            is a tool to replay all drawing operations recording with 
+            <command>-graphicssystem trace</command> into a trace buffer.
+          </para>
+          <indexterm zone="qt4 qttracereplay">
+            <primary sortas="b-qttracereplay">qttracereplay</primary>
           </indexterm>
         </listitem>
@@ -785,4 +938,29 @@
       </varlistentry>
 
+      <varlistentry id="xmlpatterns-qt4">
+        <term><command>xmlpatterns</command></term>
+        <listitem>
+          <para>
+            provides support for XPath, XQuery, XSLT, and XML Schema
+            validation.
+          </para>
+          <indexterm zone="qt4 xmlpatterns-qt4">
+            <primary sortas="b-xmlpatterns-qt4">xmlpatterns</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xmlpatternsvalidator-qt4">
+        <term><command>xmlpatternsvalidator</command></term>
+        <listitem>
+          <para>
+            is a tool used to validate XML documents.
+          </para>
+          <indexterm zone="qt4 xmlpatternsvalidator-qt4">
+            <primary sortas="b-xmlpatternsvalidator-qt4">xmlpatternsvalidator</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
Index: x/lib/qt5.xml
===================================================================
--- x/lib/qt5.xml	(revision 31b8fd2630e3af38a83de8f1b1460a24f7d84437)
+++ x/lib/qt5.xml	(revision 8b9ad6ea677ffc4b9d9b83bae979eabeef79f97d)
@@ -661,4 +661,29 @@
       </varlistentry>
 
+     <varlistentry id="qcollectiongenerator-qt5">
+        <term><command>qcollectiongenerator</command></term>
+        <listitem>
+          <para>
+            is a tool used to create a Qt Help Collection.
+          </para>
+          <indexterm zone="qt5 qcollectiongenerator-qt5">
+            <primary sortas="b-qcollectiongenerator-qt5">qcollectiongenerator</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="qdbuscpp2xml-qt5">
+        <term><command>qdbuscpp2xml</command></term>
+        <listitem>
+          <para>
+            takes a C++ source file and generates a D-Bus XML definition
+            of the interface. 
+          </para>
+          <indexterm zone="qt5 qdbuscpp2xml-qt5">
+            <primary sortas="b-qdbuscpp2xml-qt5">qdbuscpp2xml</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="qdbus-qt5">
         <term><command>qdbus</command></term>
@@ -670,4 +695,80 @@
           <indexterm zone="qt5 qdbus-qt5">
             <primary sortas="b-qdbus-qt5">qdbus</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qdbusviewer-qt5">
+        <term><command>qdbusviewer</command></term>
+        <listitem>
+          <para>
+            is a graphical D-Bus browser.
+          </para>
+          <indexterm zone="qt5 qdbusviewer-qt5">
+            <primary sortas="b-qdbusviewer-qt5">qdbusviewer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qdbusxml2cpp-qt5">
+        <term><command>qdbusxml2cpp</command></term>
+        <listitem>
+          <para>
+            is a tool that can be used to parse interface descriptions
+            and produce static code representing those interfaces,
+          </para>
+          <indexterm zone="qt5 qdbusxml2cpp-qt5">
+            <primary sortas="b-qdbusxml2cpp-qt5">qdbusxml2cpp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+ 
+      <varlistentry id="qdoc-qt5">
+        <term><command>qdoc</command></term>
+        <listitem>
+          <para>
+            is a tool used by <application>Qt</application> Developers to
+            generate documentation for software projects.
+          </para>
+          <indexterm zone="qt5 qdoc-qt5">
+            <primary sortas="b-qdoc-qt5">qdoc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qhelpconverter-qt5">
+        <term><command>qhelpconverter</command></term>
+        <listitem>
+          <para>
+            is a tool used to convert files to <application>Qt</application>
+            help format.
+          </para>
+          <indexterm zone="qt5 qhelpconverter-qt5">
+            <primary sortas="b-qhelpconverter-qt5">qhelpconverter</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qhelpgenerator-qt5">
+        <term><command>qhelpgenerator</command></term>
+        <listitem>
+          <para>
+            is a tool used to generate a <application>Qt</application>
+            compressed help file. 
+          </para>
+          <indexterm zone="qt5 qhelpgenerator-qt5">
+            <primary sortas="b-qhelpgenerator-qt5">qhelpgenerator</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qlalr-qt5">
+        <term><command>qlalr</command></term>
+        <listitem>
+          <para>
+            is a tool used to generate code from grammar specifications.
+          </para>
+          <indexterm zone="qt5 qlalr-qt5">
+            <primary sortas="b-qlalr-qt5">qlalr</primary>
           </indexterm>
         </listitem>
@@ -688,4 +789,178 @@
       </varlistentry>
 
+      <varlistentry id="qml1plugindump-qt5">
+        <term><command>qml1plugindump</command></term>
+        <listitem>
+          <para>
+            is a symlink to <application>qtchooser</application>.
+          </para>
+          <indexterm zone="qt5 qml1plugindump-qt5">
+            <primary sortas="b-qml1plugindump-qt5">qml1plugindump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="qmlbundle-qt5">
+        <term><command>qmlbundle</command></term>
+        <listitem>
+          <para>
+            is a tool used to manage QML bundle.
+          </para>
+          <indexterm zone="qt5 qmlbundle-qt5">
+            <primary sortas="b-qmlbundle-qt5">qmlbundle</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="qmleasing-qt5">
+        <term><command>qmleasing</command></term>
+        <listitem>
+          <para>
+            is a tool used to define the easing curves using an
+            interactive curve editor.
+          </para>
+          <indexterm zone="qt5 qmleasing-qt5">
+            <primary sortas="b-qmleasing-qt5">qmleasing</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qmlimportscanner-qt5">
+        <term><command>qmlimportscanner</command></term>
+        <listitem>
+          <para>
+            is a tool used to import QML files from a directory.
+          </para>
+          <indexterm zone="qt5 qmlimportscanner-qt5">
+            <primary sortas="b-qmlimportscanner-qt5">qmlimportscanner</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qmllint-qt5">
+        <term><command>qmllint</command></term>
+        <listitem>
+          <para>
+            is a syntax checker for QML files.
+          </para>
+          <indexterm zone="qt5 qmllint-qt5">
+            <primary sortas="b-qmllint-qt5">qmllint</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qmlmin-qt5">
+        <term><command>qmlmin</command></term>
+        <listitem>
+          <para>
+            removes comments and layout characters from a QML file.
+          </para>
+          <indexterm zone="qt5 qmlmin-qt5">
+            <primary sortas="b-qmlmin-qt5">qmlmin</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="qmlplugindump-qt5">
+        <term><command>qmlplugindump</command></term>
+        <listitem>
+          <para>
+            is a tool to create a qmltypes file.
+          </para>
+          <indexterm zone="qt5 qmlplugindump-qt5">
+            <primary sortas="b-qmlplugindump-qt5">qmlplugindump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qmlprofiler-qt5">
+        <term><command>qmlprofiler</command></term>
+        <listitem>
+          <para>
+            is a tool used to analyze QML applications.
+          </para>
+          <indexterm zone="qt5 qmlprofiler-qt5">
+            <primary sortas="b-qmlprofiler-qt5">qmlprofiler</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+<!--
+      <varlistentry id="qml-qt5">
+        <term><command>qml</command></term>
+        <listitem>
+          <para>
+            do something.......
+          </para>
+          <indexterm zone="qt5 qml-qt5">
+            <primary sortas="b-qml-qt5">qml</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+-->
+
+      <varlistentry id="qmlscene-qt5">
+        <term><command>qmlscene</command></term>
+        <listitem>
+          <para>
+            is a utility that loads and displays QML documents even before
+            the application is complete.
+          </para>
+          <indexterm zone="qt5 qmlscene-qt5">
+            <primary sortas="b-qmlscene-qt5">qmlscene</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qmltestrunner-qt5">
+        <term><command>qmltestrunner</command></term>
+        <listitem>
+          <para>
+            is a tool used to make tests.
+          </para>
+          <indexterm zone="qt5 qmltestrunner-qt5">
+            <primary sortas="b-qmltestrunner-qt5">qmltestrunner</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qmlviewer-qt5">
+        <term><command>qmlviewer</command></term>
+        <listitem>
+          <para>
+            is a tool for loading QML documents that makes it easy to quickly
+            develop and debug QML applications.
+          </para>
+          <indexterm zone="qt5 qmlviewer-qt5">
+            <primary sortas="b-qmlviewer-qt5">qmlviewer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qtdiag-qt5">
+        <term><command>qtdiag</command></term>
+        <listitem>
+          <para>
+            is a tool for reporting diagnostic information about Qt and its
+            environment.
+          </para>
+          <indexterm zone="qt5 qtdiag-qt5">
+            <primary sortas="b-qtdiag-qt5">qtdiag</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qtpaths-qt5">
+        <term><command>qtpaths</command></term>
+        <listitem>
+          <para>
+            is a tool to query Qt path information.
+          </para>
+          <indexterm zone="qt5 qtpaths-qt5">
+            <primary sortas="b-qtpaths-qt5">qtpaths</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="rcc-qt5">
         <term><command>rcc</command></term>
@@ -700,4 +975,17 @@
       </varlistentry>
 
+     <varlistentry id="syncqt.pl-qt5">
+        <term><command>syncqt.pl</command></term>
+        <listitem>
+          <para>
+            is a script to create the forwarding headers in the include
+            directories. It is an internal development tool.
+          </para>
+          <indexterm zone="qt5 syncqt.pl-qt5">
+            <primary sortas="b-syncqt.pl-qt5">syncqt.pl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="uic-qt5">
         <term><command>uic</command></term>
@@ -712,4 +1000,29 @@
       </varlistentry>
 
+      <varlistentry id="xmlpatterns-qt5">
+        <term><command>xmlpatterns</command></term>
+        <listitem>
+          <para>
+            provides support for XPath, XQuery, XSLT, and XML Schema
+            validation.
+          </para>
+          <indexterm zone="qt5 xmlpatterns-qt5">
+            <primary sortas="b-xmlpatterns-qt5">xmlpatterns</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="xmlpatternsvalidator-qt5">
+        <term><command>xmlpatternsvalidator</command></term>
+        <listitem>
+          <para>
+            is a tool used to validate XML documents.
+          </para>
+          <indexterm zone="qt5 xmlpatternsvalidator-qt5">
+            <primary sortas="b-xmlpatternsvalidator-qt5">xmlpatternsvalidator</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision 31b8fd2630e3af38a83de8f1b1460a24f7d84437)
+++ xsoft/other/thunderbird.xml	(revision 8b9ad6ea677ffc4b9d9b83bae979eabeef79f97d)
@@ -8,8 +8,8 @@
 <!--  <!ENTITY thunderbird-download-ftp "&mozilla-ftp;/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.bz2">-->
   <!ENTITY thunderbird-download-ftp " ">
-  <!ENTITY thunderbird-md5sum            "dd161196c6bd444643d2de54d1222d31">
+  <!ENTITY thunderbird-md5sum            "df97af48b670cdaa5196a90360c952f7">
   <!ENTITY thunderbird-size              "195 MB">
-  <!ENTITY thunderbird-buildsize         "4.5 GB (68 MB installed)">
-  <!ENTITY thunderbird-time              "5.5 SBU (with -j12, estimated 30 SBU with -j1)">
+  <!ENTITY thunderbird-buildsize         "3.9 GB (72 MB installed)">
+  <!ENTITY thunderbird-time              "8.6 SBU (with -j4, estimated 30 SBU with -j1)">
 ]>
 
@@ -89,5 +89,5 @@
       <xref linkend="alsa-lib"/>,
       <xref linkend="gtk2"/>,
-      <xref linkend="zip"/>, 
+      <xref linkend="zip"/>,
       <xref linkend="unzip"/>, and
       <xref linkend="yasm"/>
@@ -100,5 +100,5 @@
       <xref linkend="nspr"/>,
       <xref linkend="nss"/>, and
-      <xref linkend="sqlite"/> 
+      <xref linkend="sqlite"/>
     </para>
 
