Index: general/genlib/libtasn1.xml
===================================================================
--- general/genlib/libtasn1.xml	(revision 6cf11131d60695cbb9c585b38f22b5754b654ee0)
+++ general/genlib/libtasn1.xml	(revision fa668ec55a84e81acc6140f8f0f70286d93d488d)
@@ -10,5 +10,5 @@
   <!ENTITY libtasn1-size          "1.8 MB">
   <!ENTITY libtasn1-buildsize     "11 MB">
-  <!ENTITY libtasn1-time          "0.2 SBU">
+  <!ENTITY libtasn1-time          "0.2 SBU (additional 0.1 SBU for the tests)">
 ]>
 
Index: gnome/applications/brasero.xml
===================================================================
--- gnome/applications/brasero.xml	(revision 6cf11131d60695cbb9c585b38f22b5754b654ee0)
+++ gnome/applications/brasero.xml	(revision fa668ec55a84e81acc6140f8f0f70286d93d488d)
@@ -109,8 +109,8 @@
     <bridgehead renderas="sect4">Optional (Runtime)</bridgehead>
     <para role="optional">
-      <xref linkend="cdrdao"/>, one of
+      <xref linkend="cdrdao"/>,
+      <xref linkend="libdvdcss"/>, one of
       <ulink url="http://www.cdrkit.org/">cdrkit</ulink> or
-      <ulink url="http://cdrecord.berlios.de/private/cdrecord.html">cdrtools</ulink> (conflict),
-      <xref linkend="libdvdcss"/>, and
+      <ulink url="http://sourceforge.net/projects/cdrtools/files/alpha/">cdrtools</ulink> (conflict), and
       <ulink url="http://ftp.gnu.org/gnu/vcdimager/">VCDImager</ulink>
     </para>
Index: gnome/platform/gvfs.xml
===================================================================
--- gnome/platform/gvfs.xml	(revision 6cf11131d60695cbb9c585b38f22b5754b654ee0)
+++ gnome/platform/gvfs.xml	(revision fa668ec55a84e81acc6140f8f0f70286d93d488d)
@@ -9,6 +9,6 @@
   <!ENTITY gvfs-md5sum        "710f68730d6ad6708f0f1d47976bff58">
   <!ENTITY gvfs-size          "1.5 MB">
-  <!ENTITY gvfs-buildsize     "56 MB">
-  <!ENTITY gvfs-time          "0.7 SBU">
+  <!ENTITY gvfs-buildsize     "56 MB (additional 1 MB for the tests)">
+  <!ENTITY gvfs-time          "0.7 SBU (additional 0.1 SBU for the tests)">
 ]>
 
@@ -96,22 +96,22 @@
       <xref linkend="dbus-glib"/>,
       <xref linkend="fuse"/>,
+      <!-- <xref linkend="gnome-keyring"/>, libsecret covers this -->
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="libarchive"/>,
+      <xref linkend="libgcrypt"/>,
+      <xref linkend="libxml2"/>,
+      <xref linkend="libxslt"/>,
+      <xref linkend="openssh"/>,
+      <xref linkend="samba"/>,
       <!-- <ulink url="&gnome-download-http;/gnome-disk-utility">
-      GNOME Disk Utility</ulink>, obsolete for linux
-      <xref linkend="gnome-keyring"/>, libsecret covers this -->
+      GNOME Disk Utility</ulink>, obsolete for linux -->
       <ulink url="&gnome-download-http;/gnome-online-accounts">
       GNOME Online Accounts</ulink>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libarchive"/>,
       <ulink url="http://www.videolan.org/developers/libbluray.html">
       libbluray</ulink>,
       <ulink url="http://www.gnu.org/software/libcdio/">libcdio-paranoia</ulink>,
-      <xref linkend="libgcrypt"/>,
       <ulink url="http://www.gphoto.org/">libgphoto2</ulink>,
       <ulink url="http://www.libimobiledevice.org/">libimobiledevice</ulink>,
-      <ulink url="http://sourceforge.net/projects/libmtp/">libmtp</ulink>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="openssh"/>,
-      <xref linkend="samba"/>, and
+      <ulink url="http://sourceforge.net/projects/libmtp/">libmtp</ulink>, and
       <ulink url="http://twistedmatrix.com/trac/">Twisted</ulink>,
     </para>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 6cf11131d60695cbb9c585b38f22b5754b654ee0)
+++ introduction/welcome/changelog.xml	(revision fa668ec55a84e81acc6140f8f0f70286d93d488d)
@@ -44,4 +44,41 @@
 
 -->
+
+    <listitem>
+      <para>August 26th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Minor fixes to libtasn1-4.1 and Gvfs-1.20.3
+          (reordered externa/internal optional dependencies,
+          for the latter).</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to grilo-plugins-0.2.13. Fixes
+          <ulink url="&blfs-ticket-root;5431">#5431</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to grilo-0.2.11. Fixes
+          <ulink url="&blfs-ticket-root;5430">#5430</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to libfm-1.2.2.1. Fixes
+          <ulink url="&blfs-ticket-root;5429">#5429</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to gnutls-3.3.7. Fixes
+          <ulink url="&blfs-ticket-root;5427">#5427</ulink></para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Brasero-3.10.0: fix cdrtools link. Thanks to
+          Christopher G, from systemd branch. Fixes
+          <ulink url="&blfs-ticket-root;5425">#5425</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Cdrdao-1.2.3: remove instructions for gcdmaster
+          build. Thanks to Christopher G, from systemd branch. Fixes
+          <ulink url="&blfs-ticket-root;5424">#5424</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: lxde/desktop/libfm.xml
===================================================================
--- lxde/desktop/libfm.xml	(revision 6cf11131d60695cbb9c585b38f22b5754b654ee0)
+++ lxde/desktop/libfm.xml	(revision fa668ec55a84e81acc6140f8f0f70286d93d488d)
@@ -7,5 +7,5 @@
   <!ENTITY libfm-download-http "&sourceforge-repo;/pcmanfm/libfm-&libfm-version;.tar.xz">
   <!ENTITY libfm-download-ftp  " ">
-  <!ENTITY libfm-md5sum        "54c8925ee543d20b811e6094df335549">
+  <!ENTITY libfm-md5sum        "f898c480b142b56471377ef3a2810f2d">
   <!ENTITY libfm-size          "876 KB">
   <!ENTITY libfm-buildsize     "28 MB">
@@ -109,5 +109,5 @@
 <screen><userinput>./configure --prefix=/usr \
             --sysconfdir=/etc \
-            --disable-static &amp;&amp;
+            --disable-static  &amp;&amp;
 make</userinput></screen>
 
Index: multimedia/cdwriteutils/cdrdao.xml
===================================================================
--- multimedia/cdwriteutils/cdrdao.xml	(revision 6cf11131d60695cbb9c585b38f22b5754b654ee0)
+++ multimedia/cdwriteutils/cdrdao.xml	(revision fa668ec55a84e81acc6140f8f0f70286d93d488d)
@@ -67,5 +67,5 @@
       <xref linkend="lame"/> (required to build <command>toc2mp3</command>)
     </para>
-
+<!--
     <bridgehead renderas="sect4">Optional (Required to Build the
     <command>gcdmaster</command> Program)</bridgehead>
@@ -93,5 +93,5 @@
     The pieces of these two packages required to build
     <application>Cdrdao</application> are also included in the source tree
-    and are used by default.</para>
+    and are used by default.</para>-->
 
     <para condition="html" role="usernotes">User Notes:
Index: multimedia/libdriv/grilo-plugins.xml
===================================================================
--- multimedia/libdriv/grilo-plugins.xml	(revision 6cf11131d60695cbb9c585b38f22b5754b654ee0)
+++ multimedia/libdriv/grilo-plugins.xml	(revision fa668ec55a84e81acc6140f8f0f70286d93d488d)
@@ -7,8 +7,8 @@
   <!ENTITY grilo-plugins-download-http "&gnome-download-http;/grilo-plugins/0.2/grilo-plugins-&grilo-plugins-version;.tar.xz">
   <!ENTITY grilo-plugins-download-ftp  "&gnome-download-ftp;/grilo-plugins/0.2/grilo-plugins-&grilo-plugins-version;.tar.xz">
-  <!ENTITY grilo-plugins-md5sum       "3a1f8c8775f95cb2deb29f8332d1fc8f">
-  <!ENTITY grilo-plugins-size         "708 KB">
-  <!ENTITY grilo-plugins-buildsize    "19 MB (all plugins)">
-  <!ENTITY grilo-plugins-time         "0.2 SBU">
+  <!ENTITY grilo-plugins-md5sum       "45030aab3f21b561b1c899ebb7dce54d">
+  <!ENTITY grilo-plugins-size         "980 KB">
+  <!ENTITY grilo-plugins-buildsize    "24 MB (all plugins)">
+  <!ENTITY grilo-plugins-time         "0.3 SBU">
 ]>
 
@@ -65,6 +65,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="grilo"/>,
-      <xref linkend="libgcrypt"/> and
+      <xref linkend="grilo"/> and
       <xref linkend="sqlite"/>
     </para>
@@ -83,6 +82,6 @@
       <xref linkend="json-glib"/> (TMDB),
       <xref linkend="lua"/> (Lua Factory),
-      <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/gnome-online-accounts/">gnome-online-accounts</ulink> (Flickr),
-      <ulink url="https://download.gnome.org/sources/gupnp-av/">gupnp-av</ulink> (GUPnP),
+      <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/gnome-online-accounts/">gnome-online-accounts</ulink> (Flickr, Pocket),
+      <ulink url="http://ftp.gnome.org/pub/gnome/sources/gom">gom</ulink> (Bookmarks),
       <ulink url="https://www.flyn.org/projects/libdmapsharing/">libdmapsharing</ulink> (DMAP),
       <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/libgdata/">libgdata</ulink> (YouTube),
@@ -90,5 +89,6 @@
       <ulink url="http://sourceforge.net/projects/liboauth/files/">liboauth</ulink>
       (to configure Flickr personal accounts),
-      <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/libmediaart/">MEDIAART</ulink> (local-art), and
+      <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/libmediaart/">MEDIAART</ulink> (local-art),
+      <ulink url="https://launchpad.net/python-dbusmock/trunk">python-dbusmock</ulink> (dLeyna runtime tests), and
       <ulink url="https://download.gnome.org/sources/tracker/">tracker</ulink> (Tracker)
     </para>
@@ -112,5 +112,5 @@
       <command>make check 2&gt;&amp;1 | tee check.log</command>.
       A summary can be obtained with
-      <command>egrep '(TEST|PASS)' check.log</command>.
+      <command>grep -E 'PASS|FAIL' check.log</command>.
     </para>
 
@@ -140,5 +140,5 @@
           respective plugins.</seg>
         <seg>/usr/lib/grilo-0.2,
-             /usr/share/help/C/grilo-plugins and
+             /usr/share/help/C/{examples,grilo-plugins} and
              /usr/share/grilo-plugins</seg>
       </seglistitem>
Index: multimedia/libdriv/grilo.xml
===================================================================
--- multimedia/libdriv/grilo.xml	(revision 6cf11131d60695cbb9c585b38f22b5754b654ee0)
+++ multimedia/libdriv/grilo.xml	(revision fa668ec55a84e81acc6140f8f0f70286d93d488d)
@@ -7,7 +7,7 @@
   <!ENTITY grilo-download-http "&gnome-download-http;/grilo/0.2/grilo-&grilo-version;.tar.xz">
   <!ENTITY grilo-download-ftp  "&gnome-download-ftp;/grilo/0.2/grilo-&grilo-version;.tar.xz">
-  <!ENTITY grilo-md5sum       "208ace762431bed2570e62b05fad574f">
-  <!ENTITY grilo-size         "592 KB">
-  <!ENTITY grilo-buildsize    "26 MB">
+  <!ENTITY grilo-md5sum       "65ac9100dab7f93c4df41cfad58dccba">
+  <!ENTITY grilo-size         "600 KB">
+  <!ENTITY grilo-buildsize    "14 MB">
   <!ENTITY grilo-time         "0.2 SBU">
 ]>
@@ -127,5 +127,5 @@
 
       <seglistitem>
-        <seg>grilo-simple-playlist, grilo-test-ui-0.2, and grl-inspect-0.2</seg>
+        <seg>grilo-test-ui-0.2, grl-inspect-0.2 and grl-launch-0.2</seg>
         <seg>libgrilo-0.2.so, libgrlnet-0.2.so and libgrlpls-0.2.so</seg>
         <seg>/usr/include/grilo-0.2</seg>
@@ -160,4 +160,15 @@
       </varlistentry>
 
+      <varlistentry id="grl-launch">
+        <term><command>grl-launch-0.2</command></term>
+        <listitem>
+          <para>is a tool to run <application>Grilo</application> operations
+          from command line.</para>
+          <indexterm zone="grilo grl-launch">
+            <primary sortas="b-grl-launch">grl-launch</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libgrilo">
         <term><filename class='libraryfile'>libgrilo.so</filename></term>
Index: packages.ent
===================================================================
--- packages.ent	(revision 6cf11131d60695cbb9c585b38f22b5754b654ee0)
+++ packages.ent	(revision fa668ec55a84e81acc6140f8f0f70286d93d488d)
@@ -14,5 +14,5 @@
 <!ENTITY cyrus-sasl-version           "2.1.26">
 <!ENTITY gnupg2-version               "2.0.26">
-<!ENTITY gnutls-version               "3.3.6">
+<!ENTITY gnutls-version               "3.3.7">
 <!ENTITY gpgme-version                "1.5.1">
 <!ENTITY haveged-version              "1.9.1">
@@ -528,5 +528,5 @@
 <!ENTITY lxde-icon-theme-version      "0.5.0">
 <!ENTITY menu-cache-version           "0.6.0">
-<!ENTITY libfm-version                "1.2.2">
+<!ENTITY libfm-version                "1.2.2.1">
 <!ENTITY pcmanfm-version              "1.2.2">
 <!ENTITY lxpanel-version              "0.7.0">
@@ -593,6 +593,6 @@
 <!ENTITY fdk-aac-version              "0.1.3">
 <!ENTITY flac-version                 "1.3.0">
-<!ENTITY grilo-version                "0.2.10">
-<!ENTITY grilo-plugins-version        "0.2.12">
+<!ENTITY grilo-version                "0.2.11">
+<!ENTITY grilo-plugins-version        "0.2.13">
 <!ENTITY gstreamer-version            "0.10.36">
 <!ENTITY gst-plugins-base-version     "0.10.36">
Index: postlfs/security/gnutls.xml
===================================================================
--- postlfs/security/gnutls.xml	(revision 6cf11131d60695cbb9c585b38f22b5754b654ee0)
+++ postlfs/security/gnutls.xml	(revision fa668ec55a84e81acc6140f8f0f70286d93d488d)
@@ -7,8 +7,8 @@
   <!ENTITY gnutls-download-http " ">
   <!ENTITY gnutls-download-ftp  "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-&gnutls-version;.tar.xz">
-  <!ENTITY gnutls-md5sum        "84264c7d3f5fad14b7990a4e71aa340e">
+  <!ENTITY gnutls-md5sum        "a7a73cfa883cd106d70b15300552a5b5">
   <!ENTITY gnutls-size          "5.8 MB">
-  <!ENTITY gnutls-buildsize     "105 MB (additional 8 MB for the tests)">
-  <!ENTITY gnutls-time          "0.9 SBU (additional 1.9 SBU for the tests)">
+  <!ENTITY gnutls-buildsize     "104 MB (additional 8 MB for the tests)">
+  <!ENTITY gnutls-time          "0.9 SBU (additional 1.8 SBU for the tests)">
 ]>
 
