Index: multimedia/cdwriteutils/cdrdao.xml
===================================================================
--- multimedia/cdwriteutils/cdrdao.xml	(revision 420c072554cfafda413fdd5125f19d940669d701)
+++ 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 420c072554cfafda413fdd5125f19d940669d701)
+++ 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 420c072554cfafda413fdd5125f19d940669d701)
+++ 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>
