Index: general.ent
===================================================================
--- general.ent	(revision a039b3b277827d890dd312a3b56a3e9317904a04)
+++ general.ent	(revision 14ea7e80437051fbd62ce12c29487fa19dddb6c8)
@@ -146,5 +146,5 @@
 <!ENTITY cyrus-sasl-version           "2.1.26">
 <!ENTITY gnupg2-version               "2.0.22">
-<!ENTITY gnutls-version               "3.2.9">
+<!ENTITY gnutls-version               "3.2.10">
 <!ENTITY gpgme-version                "1.4.3">
 <!ENTITY iptables-version             "1.4.21">
@@ -179,5 +179,5 @@
 
 <!-- Chapter 6 -->
-<!ENTITY bluefish-version             "2.2.4">
+<!ENTITY bluefish-version             "2.2.5">
 <!ENTITY ed-version                   "1.9">
 <!ENTITY emacs-version                "24.3">
@@ -342,5 +342,5 @@
 <!ENTITY pciutils-version             "3.2.1">
 <!ENTITY pm-utils-version             "1.4.1">
-<!ENTITY raptor-version               "2.0.12">
+<!ENTITY raptor-version               "2.0.13">
 <!ENTITY rasqal-version               "0.9.31">
 <!ENTITY redland-version              "1.0.17">
@@ -503,5 +503,5 @@
 <!ENTITY db-version                   "6.0.20">
 <!ENTITY mariadb-version              "10.0.7">
-<!ENTITY mysql-version                "5.6.15">
+<!ENTITY mysql-version                "5.6.16">
 <!ENTITY postgresql-version           "9.3.2">
 <!ENTITY sqlite-version               "3.8.2">
Index: general/sysutils/raptor.xml
===================================================================
--- general/sysutils/raptor.xml	(revision a039b3b277827d890dd312a3b56a3e9317904a04)
+++ general/sysutils/raptor.xml	(revision 14ea7e80437051fbd62ce12c29487fa19dddb6c8)
@@ -7,8 +7,8 @@
   <!ENTITY raptor-download-http "http://download.librdf.org/source/raptor2-&raptor-version;.tar.gz">
   <!ENTITY raptor-download-ftp  " ">
-  <!ENTITY raptor-md5sum        "a015a7fcc2cbdd38ee1450a5eb526ab5">
+  <!ENTITY raptor-md5sum        "f380566229d6264590315b0a5341b689">
   <!ENTITY raptor-size          "1.8 MB">
-  <!ENTITY raptor-buildsize     "31 MB">
-  <!ENTITY raptor-time          "0.3 SBU">
+  <!ENTITY raptor-buildsize     "28 MB (additional 1 MB for the tests">
+  <!ENTITY raptor-time          "0.2 SBU (additional 0.4 SBU for the tests">
 ]>
 
@@ -104,5 +104,6 @@
 
     <para>
-      To test the results, issue: <command>make check</command>.
+      To test the results, issue: <command>make -k check</command>. Several
+      tests are expected to fail.
     </para>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision a039b3b277827d890dd312a3b56a3e9317904a04)
+++ introduction/welcome/changelog.xml	(revision 14ea7e80437051fbd62ce12c29487fa19dddb6c8)
@@ -48,4 +48,20 @@
       <itemizedlist>
         <listitem>
+          <para>[fernando] - Update to mysql-5.6.16. Fixes
+          <ulink url="&blfs-ticket-root;4642">#4642</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to gnutls-3.2.10. Fixes
+          <ulink url="&blfs-ticket-root;4639">#4639</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to bluefish-2.2.5. Fixes
+          <ulink url="&blfs-ticket-root;4641">#4641</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to raptor2-2.0.13. Fixes
+          <ulink url="&blfs-ticket-root;4640">#4640</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[igor] - Update to acpid-2.0.21. Fixes
           <ulink url="&blfs-ticket-root;4628">#4628</ulink>.</para>
Index: postlfs/editors/bluefish.xml
===================================================================
--- postlfs/editors/bluefish.xml	(revision a039b3b277827d890dd312a3b56a3e9317904a04)
+++ postlfs/editors/bluefish.xml	(revision 14ea7e80437051fbd62ce12c29487fa19dddb6c8)
@@ -7,8 +7,8 @@
   <!ENTITY bluefish-download-http "http://www.bennewitz.com/bluefish/stable/source/bluefish-&bluefish-version;.tar.bz2">
   <!ENTITY bluefish-download-ftp  " ">
-  <!ENTITY bluefish-md5sum        "abc06b90c38c3714f19428d16a5cb311">
+  <!ENTITY bluefish-md5sum        "1782883dcbc01faa856c162edd4c3b39">
   <!ENTITY bluefish-size          "3.6 MB">
-  <!ENTITY bluefish-buildsize     "70 MB">
-  <!ENTITY bluefish-time          "0.8 SBU">
+  <!ENTITY bluefish-buildsize     "71 MB">
+  <!ENTITY bluefish-time          "0.4 SBU">
 ]>
 
@@ -131,5 +131,5 @@
         </seg>
         <seg>
-          None
+          several under /usr/lib/bluefish/
         </seg>
         <seg>
Index: postlfs/security/gnutls.xml
===================================================================
--- postlfs/security/gnutls.xml	(revision a039b3b277827d890dd312a3b56a3e9317904a04)
+++ postlfs/security/gnutls.xml	(revision 14ea7e80437051fbd62ce12c29487fa19dddb6c8)
@@ -7,10 +7,10 @@
   <!ENTITY gnutls-download-http " ">
   <!ENTITY gnutls-download-ftp  "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-&gnutls-version;.tar.xz">
-  <!ENTITY gnutls-md5sum        "9ae2bfa55d4c12dd6005cfb7014977f9">
+  <!ENTITY gnutls-md5sum        "5b74319f1e6462a68d886d1266b282fc">
   <!ENTITY gnutls-size          "4.9 MB">
   <!ENTITY gnutls-buildsize     "102 MB (additional 10 MB for the tests and
                                  4 MB for the API documentation rebuild)">
-  <!ENTITY gnutls-time          "0.7 SBU (additional 1.2 SBU for the tests and
-                                 0.2 SBU for the API documentation rebuild)">
+  <!ENTITY gnutls-time          "0.9 SBU (additional 1.5 SBU for the tests and
+                                 0.2 SBU for API documentation rebuild)">
 ]>
 
@@ -107,4 +107,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <ulink url="http://ftp.gnu.org/gnu/autogen/">autogen</ulink>,
       <xref linkend="gtk-doc"/>,
       <xref linkend="guile"/>,
@@ -195,10 +196,10 @@
         <seg>
           libgnutls.so, libgnutls-openssl.so, libgnutls-xssl.so, libgnutlsxx.so
-          and /usr/lib/guile/2.0/guile-gnutls-v-2.so (optional)
+          and /usr/lib/guile/2.0/guile-gnutls-v-2.so
         </seg>
         <seg>
           /usr/include/gnutls,
           /usr/share/gtk-doc/html/gnutls and
-          /usr/share/guile/site/gnutls (optional)
+          /usr/share/guile/site/gnutls
         </seg>
       </seglistitem>
@@ -227,5 +228,5 @@
         <listitem>
           <para>
-            (optional) is a simple wrapper that waits for TLS/SSL connections,
+            is a simple wrapper that waits for TLS/SSL connections,
             and proxies them to an unencrypted location. Only installed if
             <xref linkend="libidn"/> is present.
Index: server/databases/mysql.xml
===================================================================
--- server/databases/mysql.xml	(revision a039b3b277827d890dd312a3b56a3e9317904a04)
+++ server/databases/mysql.xml	(revision 14ea7e80437051fbd62ce12c29487fa19dddb6c8)
@@ -7,5 +7,5 @@
   <!ENTITY mysql-download-http "http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-&mysql-version;.tar.gz">
   <!ENTITY mysql-download-ftp  " ">
-  <!ENTITY mysql-md5sum        "8c0ee8aa58258df1e1395d7c68b96647">
+  <!ENTITY mysql-md5sum        "1d3d91e8459c719bbef7c97bb499634d">
   <!ENTITY mysql-size          "32 MB">
   <!ENTITY mysql-buildsize     "572 MB (additional 359 MB installed)">
Index: xsoft/office/libreoffice.xml
===================================================================
--- xsoft/office/libreoffice.xml	(revision a039b3b277827d890dd312a3b56a3e9317904a04)
+++ xsoft/office/libreoffice.xml	(revision 14ea7e80437051fbd62ce12c29487fa19dddb6c8)
@@ -298,57 +298,56 @@
       large size of the package, the user may prefer to install in
       <filename class="directory">/opt</filename>, instead of
-      <filename class="directory">/usr</filename>. In order to do that, replace
-      <filename class="directory">/usr</filename> by
+      <filename class="directory">/usr</filename>. Depending on your choice,
+      replace <replaceable>&lt;PREFIX&gt;</replaceable> by
+      <filename class="directory">/usr</filename> or by
       <filename class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>
-      in the rest of the page, including
-      <parameter>--prefix=/usr</parameter>, but not in the commands fixing the
-      menu icons. Prepare <application>LibreOffice</application> for
-      compilation by running the following commands:
+      in the rest of the page. Prepare <application>LibreOffice</application>
+      for compilation by running the following commands:
     </para>
 
 <screen><userinput>sed -e "/gzip -f/d"   \
     -e "s|.1.gz|.1|g" \
-    -i bin/distro-install-desktop-integration &amp;&amp;
+    -i bin/distro-install-desktop-integration        &amp;&amp;
 sed -e "/distro-install-file-lists/d" -i Makefile.in &amp;&amp;
 
-chmod -v +x bin/unpack-sources &amp;&amp;
+chmod -v +x bin/unpack-sources                     &amp;&amp;
 sed -e "s/target\.mk/langlist\.mk/"                \
     -e "s/tar -xf/tar -x --strip-components=1 -f/" \
     -e "/tar -x/s/lo_src_dir/start_dir/"           \
-    -i bin/unpack-sources &amp;&amp;
-
-./autogen.sh --prefix=/usr              \
-             --sysconfdir=/etc          \
-             --with-vendor="BLFS"       \
-             --with-lang="en-US pt-BR"  \
-             --with-help                \
-             --with-alloc=system        \
-             --without-java             \
-             --disable-gconf            \
-             --disable-odk              \
-             --disable-postgresql-sdbc  \
-             --enable-release-build=yes \
-             --enable-python=system     \
-             --with-system-boost        \
-             --with-system-clucene      \
-             --with-system-cairo        \
-             --with-system-curl         \
-             --with-system-expat        \
-             --with-system-harfbuzz     \
-             --with-system-icu          \
-             --with-system-jpeg         \
-             --with-system-lcms2        \
-             --with-system-libpng       \
-             --with-system-libxml       \
-             --with-system-mesa-headers \
-             --with-system-neon         \
+    -i bin/unpack-sources                          &amp;&amp;
+
+./autogen.sh --prefix=<replaceable>&lt;PREFIX&gt;</replaceable>           \
+             --sysconfdir=/etc           \
+             --with-vendor="BLFS"        \
+             --with-lang="en-US pt-BR"   \
+             --with-help                 \
+             --with-alloc=system         \
+             --without-java              \
+             --disable-gconf             \
+             --disable-odk               \
+             --disable-postgresql-sdbc   \
+             --enable-release-build=yes  \
+             --enable-python=system      \
+             --with-system-boost         \
+             --with-system-clucene       \
+             --with-system-cairo         \
+             --with-system-curl          \
+             --with-system-expat         \
+             --with-system-harfbuzz      \
+             --with-system-icu           \
+             --with-system-jpeg          \
+             --with-system-lcms2         \
+             --with-system-libpng        \
+             --with-system-libxml        \
+             --with-system-mesa-headers  \
+             --with-system-neon          \
              --with-system-npapi-headers \
-             --with-system-nss          \
-             --with-system-odbc         \
-             --with-system-openldap     \
-             --with-system-openssl      \
-             --with-system-poppler      \
-             --with-system-redland      \
-             --with-system-zlib         \
+             --with-system-nss           \
+             --with-system-odbc          \
+             --with-system-openldap      \
+             --with-system-openssl       \
+             --with-system-poppler       \
+             --with-system-redland       \
+             --with-system-zlib          \
              --with-parallelism=$(getconf _NPROCESSORS_ONLN)</userinput></screen>
 
@@ -369,5 +368,8 @@
     </para>
 
-<screen role="root"><userinput>make distro-pack-install</userinput></screen>
+<screen role="root"><userinput>make distro-pack-install                                  &amp;&amp;
+install -v -m755 -d <replaceable>&lt;PREFIX&gt;</replaceable>/share/appdata                &amp;&amp;
+install -v -m644    sysui/desktop/appstream-appdata/*.xml \
+                    <replaceable>&lt;PREFIX&gt;</replaceable>/share/appdata</userinput></screen>
 
     <para>
@@ -376,9 +378,9 @@
     </para>
 
-<screen role="root"><userinput>chown -cR 0:0 dictionaries/                                                  &amp;&amp;
-mkdir -pv /usr/lib/libreoffice/share/extensions/dict-en                      &amp;&amp;
-cp -vR dictionaries/en/*    /usr/lib/libreoffice/share/extensions/dict-en    &amp;&amp;
-mkdir -pv /usr/lib/libreoffice/share/extensions/dict-pt-BR                   &amp;&amp;
-cp -vR dictionaries/pt_BR/* /usr/lib/libreoffice/share/extensions/dict-pt-BR</userinput></screen>
+<screen role="root"><userinput>chown -cR 0:0 dictionaries/                                                      &amp;&amp;
+mkdir -pv <replaceable>&lt;PREFIX&gt;</replaceable>/lib/libreoffice/share/extensions/dict-en                      &amp;&amp;
+cp -vR dictionaries/en/*    <replaceable>&lt;PREFIX&gt;</replaceable>/lib/libreoffice/share/extensions/dict-en    &amp;&amp;
+mkdir -pv <replaceable>&lt;PREFIX&gt;</replaceable>/lib/libreoffice/share/extensions/dict-pt-BR                   &amp;&amp;
+cp -vR dictionaries/pt_BR/* <replaceable>&lt;PREFIX&gt;</replaceable>/lib/libreoffice/share/extensions/dict-pt-BR</userinput></screen>
 
     <para>
@@ -386,9 +388,9 @@
        <filename class="directory">/usr</filename> by
        <filename class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>.
-       If installed in <filename class="directory">/opt</filename> and there
-       are no icons in the new items of the desktop menu, optionally run
-       the following commands, as <systemitem class="username">root</systemitem>
-       user (it may be necessary to logout the session, before the
-       icons appear):
+       If installed in <filename class="directory">/opt</filename> and the
+       icons in the new items of the desktop menu are not properly displayed,
+       optionally run the following commands, as
+       <systemitem class="username">root</systemitem> user (it may be necessary
+       to logout the session, before the icons appear):
     </para>
 
@@ -490,5 +492,5 @@
       as a Developer Build, because their default installation paths and user
       profile paths are different. Developer Build displays the words "Dev" and
-      "LibreOfficeDev" in several places (e.g, menu and splash scren).
+      "Beta" in several places (e.g, menu and splash scren).
     </para>
 
@@ -562,12 +564,12 @@
           loimpress, lomath, loweb, lowriter, soffice and unopkg;
           several programs under
-          <userinput>&lt;prefix&gt;</userinput>/lib/libreoffice/program
+          <userinput><replaceable>&lt;PREFIX&gt;</replaceable></userinput>/lib/libreoffice/program
         </seg>
         <seg>
           several libraries under
-          <userinput>&lt;prefix&gt;</userinput>/lib/libreoffice/{ure/lib,program}
+          <userinput><replaceable>&lt;PREFIX&gt;</replaceable></userinput>/lib/libreoffice/{ure/lib,program}
         </seg>
         <seg>
-          <userinput>&lt;prefix&gt;</userinput>/lib/libreoffice
+          <userinput><replaceable>&lt;PREFIX&gt;</replaceable></userinput>/lib/libreoffice
         </seg>
       </seglistitem>
