Index: multimedia/libdriv/grilo-plugins-systemd.xml
===================================================================
--- multimedia/libdriv/grilo-plugins-systemd.xml	(revision 73a7e6b4d4c044422b14433794554172012059fe)
+++ multimedia/libdriv/grilo-plugins-systemd.xml	(revision 73a7e6b4d4c044422b14433794554172012059fe)
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!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">
+]>
+
+<sect1 id="grilo-plugins" xreflabel="Grilo-Plugins-&grilo-plugins-version;">
+  <?dbhtml filename="grilo-plugins.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Grilo-Plugins-&grilo-plugins-version;</title>
+
+  <indexterm zone="grilo-plugins">
+    <primary sortas="a-Grilo-Plugins">Grilo-Plugins</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Grilo-Plugins</title>
+
+    <para><application>Grilo-Plugins</application> is a collection of plugins
+    (Apple Trailers, Blip.tv, Bookmarks, Filesystem, Flickr, Jamendo, Magnatune,
+    Rai.tv, Tracker, Youtube, between others) to make media discovery and
+    browsing easy for applications that support <application>Grilo</application>
+    framework, such as <application>Totem</application> (some plugins are
+    disabled in <application>Totem</application>).</para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&grilo-plugins-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&grilo-plugins-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &grilo-plugins-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &grilo-plugins-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &grilo-plugins-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &grilo-plugins-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Grilo-Plugins Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="grilo"/>,
+      <xref linkend="libgcrypt"/> and
+      <xref linkend="sqlite"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libsoup"/>,
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="totem-pl-parser"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="avahi"/>,
+      <xref linkend="gmime"/> (Podcasts),
+      <xref linkend="gnome-online-accounts"/> (Flickr),
+      <ulink url="https://download.gnome.org/sources/gupnp-av/">gupnp-av</ulink> (GUPnP),
+      <xref linkend="json-glib"/> (TMDB),
+      <ulink url="https://www.flyn.org/projects/libdmapsharing/">libdmapsharing</ulink> (DMAP),
+      <xref linkend="libgdata"/> (YouTube),
+      <ulink url="http://sourceforge.net/projects/quvi">libquvi (version 0.9)</ulink> (YouTube),
+      <xref linkend="liboauth"/>(to configure Flickr personal accounts),
+      <xref linkend="lua"/> (Lua Factory),
+      <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/libmediaart/">MEDIAART</ulink> (local-art), and
+      <ulink url="https://download.gnome.org/sources/tracker/">tracker</ulink> (Tracker)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/grilo-plugins"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Grilo-Plugins</title>
+
+    <para>Install <application>Grilo-Plugins</application> by running the
+    following commands:</para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue:
+      <command>make check 2&gt;&amp;1 | tee check.log</command>.
+      A summary can be obtained with
+      <command>egrep '(TEST|PASS)' check.log</command>.
+    </para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      To test which plugins are installed and that <xref linkend="grilo"/> is
+      working, issue  <command>grl-inspect-0.2</command> or 
+      <command>grilo-test-ui-0.2</command> (the latter, from an X terminal).
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>Several under /usr/lib/grilo-0.2, with names related to the
+          respective plugins.</seg>
+        <seg>/usr/lib/grilo-0.2,
+             /usr/share/help/C/grilo-plugins and
+             /usr/share/grilo-plugins</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: multimedia/libdriv/grilo-plugins.xml
===================================================================
--- multimedia/libdriv/grilo-plugins.xml	(revision fe189867aeab95fe1470982f6d750521f3f96504)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!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">
-]>
-
-<sect1 id="grilo-plugins" xreflabel="Grilo-Plugins-&grilo-plugins-version;">
-  <?dbhtml filename="grilo-plugins.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Grilo-Plugins-&grilo-plugins-version;</title>
-
-  <indexterm zone="grilo-plugins">
-    <primary sortas="a-Grilo-Plugins">Grilo-Plugins</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Grilo-Plugins</title>
-
-    <para><application>Grilo-Plugins</application> is a collection of plugins
-    (Apple Trailers, Blip.tv, Bookmarks, Filesystem, Flickr, Jamendo, Magnatune,
-    Rai.tv, Tracker, Youtube, between others) to make media discovery and
-    browsing easy for applications that support <application>Grilo</application>
-    framework, such as <application>Totem</application> (some plugins are
-    disabled in <application>Totem</application>).</para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&grilo-plugins-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&grilo-plugins-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &grilo-plugins-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &grilo-plugins-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &grilo-plugins-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &grilo-plugins-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Grilo-Plugins Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="grilo"/>,
-      <xref linkend="libgcrypt"/> and
-      <xref linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libsoup"/>,
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="totem-pl-parser"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/>,
-      <xref linkend="gmime"/> (Podcasts),
-      <xref linkend="gnome-online-accounts"/> (Flickr),
-      <ulink url="https://download.gnome.org/sources/gupnp-av/">gupnp-av</ulink> (GUPnP),
-      <xref linkend="json-glib"/> (TMDB),
-      <ulink url="https://www.flyn.org/projects/libdmapsharing/">libdmapsharing</ulink> (DMAP),
-      <xref linkend="libgdata"/> (YouTube),
-      <ulink url="http://sourceforge.net/projects/quvi">libquvi (version 0.9)</ulink> (YouTube),
-      <xref linkend="liboauth"/>(to configure Flickr personal accounts),
-      <xref linkend="lua"/> (Lua Factory),
-      <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/libmediaart/">MEDIAART</ulink> (local-art), and
-      <ulink url="https://download.gnome.org/sources/tracker/">tracker</ulink> (Tracker)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/grilo-plugins"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Grilo-Plugins</title>
-
-    <para>Install <application>Grilo-Plugins</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue:
-      <command>make check 2&gt;&amp;1 | tee check.log</command>.
-      A summary can be obtained with
-      <command>egrep '(TEST|PASS)' check.log</command>.
-    </para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      To test which plugins are installed and that <xref linkend="grilo"/> is
-      working, issue  <command>grl-inspect-0.2</command> or 
-      <command>grilo-test-ui-0.2</command> (the latter, from an X terminal).
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>Several under /usr/lib/grilo-0.2, with names related to the
-          respective plugins.</seg>
-        <seg>/usr/lib/grilo-0.2,
-             /usr/share/help/C/grilo-plugins and
-             /usr/share/grilo-plugins</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/libdriv.xml
===================================================================
--- multimedia/libdriv/libdriv.xml	(revision fe189867aeab95fe1470982f6d750521f3f96504)
+++ multimedia/libdriv/libdriv.xml	(revision 73a7e6b4d4c044422b14433794554172012059fe)
@@ -35,5 +35,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flac.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grilo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grilo-plugins.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grilo-plugins-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gstreamer.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst-plugins-base-systemd.xml"/>
