Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 1a7e901a84b9579de87e330678436a7775358484)
+++ general/genlib/genlib.xml	(revision ad53d2d071fbcf78faba0e1aee484342aa58953d)
@@ -134,4 +134,8 @@
   <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qjson.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="talloc.xml"/>
+
+  <!--systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-glib.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wayland.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wayland-protocols.xml"/>
Index: general/genlib/telepathy-glib.xml
===================================================================
--- general/genlib/telepathy-glib.xml	(revision ad53d2d071fbcf78faba0e1aee484342aa58953d)
+++ general/genlib/telepathy-glib.xml	(revision ad53d2d071fbcf78faba0e1aee484342aa58953d)
@@ -0,0 +1,191 @@
+<?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 telepathy-glib-download-http
+           "https://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-&telepathy-glib-version;.tar.gz">
+  <!ENTITY telepathy-glib-download-ftp  " ">
+  <!ENTITY telepathy-glib-md5sum        "cbeb0a24acc26e7f095be281c324da69">
+  <!ENTITY telepathy-glib-size          "3.8 MB">
+  <!ENTITY telepathy-glib-buildsize     "222 MB">
+  <!ENTITY telepathy-glib-time          "1.2 SBU">
+]>
+
+<sect1 id="telepathy-glib" xreflabel="telepathy-glib-&telepathy-glib-version;" revision="systemd">
+  <?dbhtml filename="telepathy-glib.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>telepathy-glib-&telepathy-glib-version;</title>
+
+  <indexterm zone="telepathy-glib">
+    <primary sortas="a-telepathy-glib">telepathy-glib</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Telepathy GLib</title>
+
+    <para>
+      The <application>Telepathy GLib</application> contains a library used by
+      <application>GLib</application> based <application>Telepathy</application>
+      components. Telepathy is a <application>D-Bus</application> framework for
+      unifying real time communication, including instant messaging, voice calls
+      and video calls. It abstracts differences between protocols to provide a
+      unified interface for applications.
+    </para>
+
+    &lfs81_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&telepathy-glib-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&telepathy-glib-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &telepathy-glib-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &telepathy-glib-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &telepathy-glib-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &telepathy-glib-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Telepathy GLib Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="dbus-glib"/> and
+      <xref linkend="libxslt"/>
+    </para>
+
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>, and
+      <xref linkend="vala"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/telepathy-glib"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Telepathy Glib</title>
+
+    <para>
+      Install <application>Telepathy GLib</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --enable-vala-bindings \
+            --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make -k check</command>.
+      Four tests are known to fail: <emphasis>test-account</emphasis>, 
+      <emphasis>test-cm</emphasis>, <emphasis>test-contact-lists</emphasis>, and
+      <emphasis>test-contact-list-client</emphasis>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--enable-vala-bindings</parameter>: This switch
+      enables building of the Vala bindings. Remove if you don't
+      have <xref linkend="vala"/> installed.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </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>
+          libtelepathy-glib.so
+        </seg>
+        <seg>
+          /usr/include/telepathy-1.0 and
+          /usr/share/gtk-doc/html/telepathy-glib
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libtelepathy-glib">
+        <term><filename class="libraryfile">libtelepathy-glib.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Telepathy GLib</application> API functions.
+          </para>
+          <indexterm zone="telepathy-glib libtelepathy-glib">
+            <primary sortas="c-libtelepathy-glib">libtelepathy-glib.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision 1a7e901a84b9579de87e330678436a7775358484)
+++ general/genutils/genutils.xml	(revision ad53d2d071fbcf78faba0e1aee484342aa58953d)
@@ -47,4 +47,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shared-mime-info.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sharutils.xml"/>
+
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-logger.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-mission-control.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tidy-html5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="time.xml"/>
Index: general/genutils/telepathy-logger.xml
===================================================================
--- general/genutils/telepathy-logger.xml	(revision ad53d2d071fbcf78faba0e1aee484342aa58953d)
+++ general/genutils/telepathy-logger.xml	(revision ad53d2d071fbcf78faba0e1aee484342aa58953d)
@@ -0,0 +1,196 @@
+<?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 telepathy-logger-download-http
+           "https://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-&telepathy-logger-version;.tar.bz2">
+  <!ENTITY telepathy-logger-download-ftp  " ">
+  <!ENTITY telepathy-logger-md5sum        "c2f6a31c76cbdf8790500cf4f872ba71">
+  <!ENTITY telepathy-logger-size          "552 KB">
+  <!ENTITY telepathy-logger-buildsize     "17 MB">
+  <!ENTITY telepathy-logger-time          "0.2 SBU">
+]>
+
+<sect1 id="telepathy-logger" xreflabel="telepathy-logger-&telepathy-logger-version;" revision="systemd">
+  <?dbhtml filename="telepathy-logger.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>telepathy-logger-&telepathy-logger-version;</title>
+
+  <indexterm zone="telepathy-logger">
+    <primary sortas="a-telepathy-logger">telepathy-logger</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Telepathy Logger</title>
+
+    <para>
+      The <application>Telepathy Logger</application> package is a headless
+      observer client that logs information received by the
+      <application>Telepathy</application> framework. It features pluggable
+      backends to log different sorts of messages in different formats.
+    </para>
+
+    &lfs81_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&telepathy-logger-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&telepathy-logger-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &telepathy-logger-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &telepathy-logger-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &telepathy-logger-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &telepathy-logger-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Telepathy Logger Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="sqlite"/> and
+      <xref linkend="telepathy-glib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/telepathy-logger"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Telepathy Logger</title>
+
+    <para>
+      Fix a deprecated schema entry:
+    </para>
+
+<screen><userinput>sed 's@/apps/@/org/freedesktop/@' \
+    -i data/org.freedesktop.Telepathy.Logger.gschema.xml.in</userinput></screen>
+
+    <para>
+      Install <application>Telepathy Logger</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild-problem.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          telepathy-logger
+        </seg>
+        <seg>
+          libtelepathy-logger.so
+        </seg>
+        <seg>
+          /usr/include/telepathy-logger-0.2,
+          /usr/share/gtk-doc/html/telepathy-logger and
+          /usr/share/telepathy
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="telepathy-logger-prog">
+        <term><command>telepathy-logger</command></term>
+        <listitem>
+          <para>
+            is the <application>Telepathy Logger</application> D-Bus service.
+          </para>
+          <indexterm zone="telepathy-logger telepathy-logger-prog">
+            <primary sortas="b-telepathy-logger">telepathy-logger</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libtelepathy-logger">
+        <term><filename class="libraryfile">libtelepathy-logger.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Telepathy Logger</application> API functions.
+          </para>
+          <indexterm zone="telepathy-logger libtelepathy-logger">
+            <primary sortas="c-libtelepathy-logger">libtelepathy-logger.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genutils/telepathy-mission-control.xml
===================================================================
--- general/genutils/telepathy-mission-control.xml	(revision ad53d2d071fbcf78faba0e1aee484342aa58953d)
+++ general/genutils/telepathy-mission-control.xml	(revision ad53d2d071fbcf78faba0e1aee484342aa58953d)
@@ -0,0 +1,226 @@
+<?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 telepathy-mission-control-download-http
+           "https://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-&telepathy-mission-control-version;.tar.gz">
+  <!ENTITY telepathy-mission-control-download-ftp  " ">
+  <!ENTITY telepathy-mission-control-md5sum        "eab6c941038702edeece1168f395300c">
+  <!ENTITY telepathy-mission-control-size          "1.0 MB">
+  <!ENTITY telepathy-mission-control-buildsize     "27 MB">
+  <!ENTITY telepathy-mission-control-time          "0.3 SBU">
+]>
+
+<sect1 id="telepathy-mission-control" xreflabel="telepathy-mission-control-&telepathy-mission-control-version;" revision="systemd">
+  <?dbhtml filename="telepathy-mission-control.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>telepathy-mission-control-&telepathy-mission-control-version;</title>
+
+  <indexterm zone="telepathy-mission-control">
+    <primary sortas="a-telepathy-mission-control">telepathy-mission-control</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Telepathy Mission Control</title>
+
+    <para>
+      <application>Telepathy Mission Control</application> is an account manager
+      and channel dispatcher for the <application>Telepathy</application>
+      framework, allowing user interfaces  and other clients to share connections
+      to real-time communication services without conflicting.
+    </para>
+
+    &lfs81_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&telepathy-mission-control-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&telepathy-mission-control-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &telepathy-mission-control-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &telepathy-mission-control-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &telepathy-mission-control-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &telepathy-mission-control-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Telepathy Mission Control Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="telepathy-glib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="NetworkManager"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>,
+      <ulink url="&gnome-download-http;/libgnome-keyring">libgnome-keyring</ulink>, and
+      <xref linkend="upower"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/telepathy-mission-control"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Telepathy Mission Control</title>
+
+    <para>
+      Install <application>Telepathy Mission Control</application> by
+      running the following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a testsuite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+<!--
+    <para>
+      <parameter>- -disable-upower</parameter> This switch
+      disables the use of <application>UPower</application>
+      because <application>Telepathy Mission Control</application>
+      fails to build with latest version.
+    </para>
+As far as I can tell, this is no longer needed as of 5.16.4. -renodr 
+-->
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          mc-tool, mc-wait-for-name and mission-control-5 (library executable)
+        </seg>
+        <seg>
+          libmission-control-plugins.so
+        </seg>
+        <seg>
+          /usr/include/mission-control-5.5 and
+          /usr/share/gtk-doc/html/mission-control-plugins
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="mc-tool">
+        <term><command>mc-tool</command></term>
+        <listitem>
+          <para>
+            is a command line tool used to manipulate Mission Control accounts.
+          </para>
+          <indexterm zone="telepathy-mission-control mc-tool">
+            <primary sortas="b-mc-tool">mc-tool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mc-wait-for-name">
+        <term><command>mc-wait-for-name</command></term>
+        <listitem>
+          <para>
+            waits for a (D-Bus) bus name that will (after a while) be provided
+            automatically by the desktop session.
+          </para>
+          <indexterm zone="telepathy-mission-control mc-wait-for-name">
+            <primary sortas="b-mc-wait-for-name">mc-wait-for-name</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mission-control-5">
+        <term><command>mission-control-5</command></term>
+        <listitem>
+          <para>
+            is a <application>D-Bus</application> service which runs on the session
+            bus to implement AccountManager and ChannelDispatcher services described
+            in the <application>Telepathy</application> D-Bus specification.
+          </para>
+          <indexterm zone="telepathy-mission-control mission-control-5">
+            <primary sortas="b-mission-control-5">mission-control-5</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libmission-control-plugins">
+        <term><filename class="libraryfile">libmission-control-plugins.so</filename></term>
+        <listitem>
+          <para>
+            contains <application>Telepathy Mission Control</application> plugin API functions.
+          </para>
+          <indexterm zone="telepathy-mission-control libmission-control-plugins">
+            <primary sortas="c-libmission-control-plugins">libmission-control-plugins.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome.ent
===================================================================
--- gnome.ent	(revision 1a7e901a84b9579de87e330678436a7775358484)
+++ gnome.ent	(revision ad53d2d071fbcf78faba0e1aee484342aa58953d)
@@ -43,9 +43,4 @@
 <!ENTITY folks-version                     "0.11.4">
 <!ENTITY gfbgraph-version                  "0.2.3">
-
-<!-- Telepathy Framework (systemd) -->
-<!ENTITY telepathy-glib-version            "0.24.1">
-<!ENTITY telepathy-logger-version          "0.8.2">
-<!ENTITY telepathy-mission-control-version "5.16.4">
 
 <!-- Runtime (sysv) and Desktop (systemd) -->
Index: ome/platform/dummy-tel.xml
===================================================================
--- gnome/platform/dummy-tel.xml	(revision 1a7e901a84b9579de87e330678436a7775358484)
+++ 	(revision )
@@ -1,15 +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">
-
-<sect1 role="dummy" revision="systemd">
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date: 2015-09-20 17:38:20 -0500 (Sun, 20 Sep 2015) $</date>
-  </sect1info>
-
-  <title>Telepathy Framework</title>
-  <para/>
-</sect1>
-
Index: gnome/platform/platform.xml
===================================================================
--- gnome/platform/platform.xml	(revision 1a7e901a84b9579de87e330678436a7775358484)
+++ gnome/platform/platform.xml	(revision ad53d2d071fbcf78faba0e1aee484342aa58953d)
@@ -70,10 +70,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gfbgraph.xml"/>
 
-<!-- systemd: Telepathy Framework -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-tel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-glib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-logger.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-mission-control.xml"/>
-
 <!-- systemd: GNOME Desktop -->
 <!-- trunk: Required Runtime Dependencies -->
Index: ome/platform/telepathy-glib.xml
===================================================================
--- gnome/platform/telepathy-glib.xml	(revision 1a7e901a84b9579de87e330678436a7775358484)
+++ 	(revision )
@@ -1,191 +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 telepathy-glib-download-http
-           "https://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-&telepathy-glib-version;.tar.gz">
-  <!ENTITY telepathy-glib-download-ftp  " ">
-  <!ENTITY telepathy-glib-md5sum        "cbeb0a24acc26e7f095be281c324da69">
-  <!ENTITY telepathy-glib-size          "3.8 MB">
-  <!ENTITY telepathy-glib-buildsize     "222 MB">
-  <!ENTITY telepathy-glib-time          "1.2 SBU">
-]>
-
-<sect1 id="telepathy-glib" xreflabel="telepathy-glib-&telepathy-glib-version;" revision="systemd">
-  <?dbhtml filename="telepathy-glib.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>telepathy-glib-&telepathy-glib-version;</title>
-
-  <indexterm zone="telepathy-glib">
-    <primary sortas="a-telepathy-glib">telepathy-glib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Telepathy GLib</title>
-
-    <para>
-      The <application>Telepathy GLib</application> contains a library used by
-      <application>GLib</application> based <application>Telepathy</application>
-      components. Telepathy is a <application>D-Bus</application> framework for
-      unifying real time communication, including instant messaging, voice calls
-      and video calls. It abstracts differences between protocols to provide a
-      unified interface for applications.
-    </para>
-
-    &lfs81_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&telepathy-glib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&telepathy-glib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &telepathy-glib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &telepathy-glib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &telepathy-glib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &telepathy-glib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Telepathy GLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus-glib"/> and
-      <xref linkend="libxslt"/>
-    </para>
-
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/telepathy-glib"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Telepathy Glib</title>
-
-    <para>
-      Install <application>Telepathy GLib</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --enable-vala-bindings \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -k check</command>.
-      Four tests are known to fail: <emphasis>test-account</emphasis>, 
-      <emphasis>test-cm</emphasis>, <emphasis>test-contact-lists</emphasis>, and
-      <emphasis>test-contact-list-client</emphasis>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-vala-bindings</parameter>: This switch
-      enables building of the Vala bindings. Remove if you don't
-      have <xref linkend="vala"/> installed.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </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>
-          libtelepathy-glib.so
-        </seg>
-        <seg>
-          /usr/include/telepathy-1.0 and
-          /usr/share/gtk-doc/html/telepathy-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libtelepathy-glib">
-        <term><filename class="libraryfile">libtelepathy-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Telepathy GLib</application> API functions.
-          </para>
-          <indexterm zone="telepathy-glib libtelepathy-glib">
-            <primary sortas="c-libtelepathy-glib">libtelepathy-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/telepathy-logger.xml
===================================================================
--- gnome/platform/telepathy-logger.xml	(revision 1a7e901a84b9579de87e330678436a7775358484)
+++ 	(revision )
@@ -1,196 +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 telepathy-logger-download-http
-           "https://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-&telepathy-logger-version;.tar.bz2">
-  <!ENTITY telepathy-logger-download-ftp  " ">
-  <!ENTITY telepathy-logger-md5sum        "c2f6a31c76cbdf8790500cf4f872ba71">
-  <!ENTITY telepathy-logger-size          "552 KB">
-  <!ENTITY telepathy-logger-buildsize     "17 MB">
-  <!ENTITY telepathy-logger-time          "0.2 SBU">
-]>
-
-<sect1 id="telepathy-logger" xreflabel="telepathy-logger-&telepathy-logger-version;" revision="systemd">
-  <?dbhtml filename="telepathy-logger.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>telepathy-logger-&telepathy-logger-version;</title>
-
-  <indexterm zone="telepathy-logger">
-    <primary sortas="a-telepathy-logger">telepathy-logger</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Telepathy Logger</title>
-
-    <para>
-      The <application>Telepathy Logger</application> package is a headless
-      observer client that logs information received by the
-      <application>Telepathy</application> framework. It features pluggable
-      backends to log different sorts of messages in different formats.
-    </para>
-
-    &lfs81_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&telepathy-logger-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&telepathy-logger-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &telepathy-logger-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &telepathy-logger-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &telepathy-logger-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &telepathy-logger-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Telepathy Logger Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="sqlite"/> and
-      <xref linkend="telepathy-glib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/telepathy-logger"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Telepathy Logger</title>
-
-    <para>
-      Fix a deprecated schema entry:
-    </para>
-
-<screen><userinput>sed 's@/apps/@/org/freedesktop/@' \
-    -i data/org.freedesktop.Telepathy.Logger.gschema.xml.in</userinput></screen>
-
-    <para>
-      Install <application>Telepathy Logger</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild-problem.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          telepathy-logger
-        </seg>
-        <seg>
-          libtelepathy-logger.so
-        </seg>
-        <seg>
-          /usr/include/telepathy-logger-0.2,
-          /usr/share/gtk-doc/html/telepathy-logger and
-          /usr/share/telepathy
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="telepathy-logger-prog">
-        <term><command>telepathy-logger</command></term>
-        <listitem>
-          <para>
-            is the <application>Telepathy Logger</application> D-Bus service.
-          </para>
-          <indexterm zone="telepathy-logger telepathy-logger-prog">
-            <primary sortas="b-telepathy-logger">telepathy-logger</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtelepathy-logger">
-        <term><filename class="libraryfile">libtelepathy-logger.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Telepathy Logger</application> API functions.
-          </para>
-          <indexterm zone="telepathy-logger libtelepathy-logger">
-            <primary sortas="c-libtelepathy-logger">libtelepathy-logger.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/telepathy-mission-control.xml
===================================================================
--- gnome/platform/telepathy-mission-control.xml	(revision 1a7e901a84b9579de87e330678436a7775358484)
+++ 	(revision )
@@ -1,226 +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 telepathy-mission-control-download-http
-           "https://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-&telepathy-mission-control-version;.tar.gz">
-  <!ENTITY telepathy-mission-control-download-ftp  " ">
-  <!ENTITY telepathy-mission-control-md5sum        "eab6c941038702edeece1168f395300c">
-  <!ENTITY telepathy-mission-control-size          "1.0 MB">
-  <!ENTITY telepathy-mission-control-buildsize     "27 MB">
-  <!ENTITY telepathy-mission-control-time          "0.3 SBU">
-]>
-
-<sect1 id="telepathy-mission-control" xreflabel="telepathy-mission-control-&telepathy-mission-control-version;" revision="systemd">
-  <?dbhtml filename="telepathy-mission-control.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>telepathy-mission-control-&telepathy-mission-control-version;</title>
-
-  <indexterm zone="telepathy-mission-control">
-    <primary sortas="a-telepathy-mission-control">telepathy-mission-control</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Telepathy Mission Control</title>
-
-    <para>
-      <application>Telepathy Mission Control</application> is an account manager
-      and channel dispatcher for the <application>Telepathy</application>
-      framework, allowing user interfaces  and other clients to share connections
-      to real-time communication services without conflicting.
-    </para>
-
-    &lfs81_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&telepathy-mission-control-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&telepathy-mission-control-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &telepathy-mission-control-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &telepathy-mission-control-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &telepathy-mission-control-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &telepathy-mission-control-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Telepathy Mission Control Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="telepathy-glib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="NetworkManager"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <ulink url="&gnome-download-http;/libgnome-keyring">libgnome-keyring</ulink>, and
-      <xref linkend="upower"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/telepathy-mission-control"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Telepathy Mission Control</title>
-
-    <para>
-      Install <application>Telepathy Mission Control</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a testsuite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-<!--
-    <para>
-      <parameter>- -disable-upower</parameter> This switch
-      disables the use of <application>UPower</application>
-      because <application>Telepathy Mission Control</application>
-      fails to build with latest version.
-    </para>
-As far as I can tell, this is no longer needed as of 5.16.4. -renodr 
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mc-tool, mc-wait-for-name and mission-control-5 (library executable)
-        </seg>
-        <seg>
-          libmission-control-plugins.so
-        </seg>
-        <seg>
-          /usr/include/mission-control-5.5 and
-          /usr/share/gtk-doc/html/mission-control-plugins
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mc-tool">
-        <term><command>mc-tool</command></term>
-        <listitem>
-          <para>
-            is a command line tool used to manipulate Mission Control accounts.
-          </para>
-          <indexterm zone="telepathy-mission-control mc-tool">
-            <primary sortas="b-mc-tool">mc-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mc-wait-for-name">
-        <term><command>mc-wait-for-name</command></term>
-        <listitem>
-          <para>
-            waits for a (D-Bus) bus name that will (after a while) be provided
-            automatically by the desktop session.
-          </para>
-          <indexterm zone="telepathy-mission-control mc-wait-for-name">
-            <primary sortas="b-mc-wait-for-name">mc-wait-for-name</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mission-control-5">
-        <term><command>mission-control-5</command></term>
-        <listitem>
-          <para>
-            is a <application>D-Bus</application> service which runs on the session
-            bus to implement AccountManager and ChannelDispatcher services described
-            in the <application>Telepathy</application> D-Bus specification.
-          </para>
-          <indexterm zone="telepathy-mission-control mission-control-5">
-            <primary sortas="b-mission-control-5">mission-control-5</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmission-control-plugins">
-        <term><filename class="libraryfile">libmission-control-plugins.so</filename></term>
-        <listitem>
-          <para>
-            contains <application>Telepathy Mission Control</application> plugin API functions.
-          </para>
-          <indexterm zone="telepathy-mission-control libmission-control-plugins">
-            <primary sortas="c-libmission-control-plugins">libmission-control-plugins.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 1a7e901a84b9579de87e330678436a7775358484)
+++ introduction/welcome/changelog.xml	(revision ad53d2d071fbcf78faba0e1aee484342aa58953d)
@@ -46,4 +46,8 @@
       <itemizedlist>
         <listitem>
+          <para>[dj] - Move Telepathy packages from Gnome to genlib and
+          genutils sections.</para>
+        </listitem>
+        <listitem>
           <para>[dj] - Update to cheese-3.26.0.</para>
         </listitem>
Index: packages.ent
===================================================================
--- packages.ent	(revision 1a7e901a84b9579de87e330678436a7775358484)
+++ packages.ent	(revision ad53d2d071fbcf78faba0e1aee484342aa58953d)
@@ -182,4 +182,5 @@
 <!ENTITY sbc-version                  "1.3">
 <!ENTITY talloc-version               "2.1.10">
+<!ENTITY telepathy-glib-version       "0.24.1">
 <!ENTITY wayland-version              "1.14.0">
 <!ENTITY wayland-protocols-version    "1.11">
@@ -244,4 +245,6 @@
 <!ENTITY screen-version               "4.5.1">
 <!ENTITY sharutils-version            "4.15.2">
+<!ENTITY telepathy-logger-version     "0.8.2">
+<!ENTITY telepathy-mission-control-version "5.16.4">
 <!ENTITY tidy-html5-version           "5.4.0">
 <!ENTITY time-version                 "1.7">
