Index: general/sysutils/accountsservice.xml
===================================================================
--- general/sysutils/accountsservice.xml	(revision 14c2a270b587a1bc6417aa0e77763c18e9108d8a)
+++ general/sysutils/accountsservice.xml	(revision 14c2a270b587a1bc6417aa0e77763c18e9108d8a)
@@ -0,0 +1,229 @@
+<?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 accountsservice-download-http
+           "https://www.freedesktop.org/software/accountsservice/accountsservice-&accountsservice-version;.tar.xz">
+  <!ENTITY accountsservice-download-ftp  " ">
+  <!ENTITY accountsservice-md5sum        "b4c0a74bb5f8680dda0b7be27b1c02d9">
+  <!ENTITY accountsservice-size          "376 KB">
+  <!ENTITY accountsservice-buildsize     "11 MB">
+  <!ENTITY accountsservice-time          "0.1 SBU">
+]>
+
+<sect1 id="accountsservice" xreflabel="AccountsService-&accountsservice-version;" revision="systemd">
+  <?dbhtml filename="accountsservice.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>AccountsService-&accountsservice-version;</title>
+
+  <indexterm zone="accountsservice">
+    <primary sortas="a-AccountsService">AccountsService</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to AccountsService</title>
+
+    <para>
+      The <application>AccountsService</application> package provides a
+      set of <application>D-Bus</application> interfaces for querying
+      and manipulating user account information and an implementation
+      of those interfaces based on the usermod(8), useradd(8) and
+      userdel(8) commands.
+    </para>
+
+    &lfs81_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&accountsservice-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&accountsservice-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &accountsservice-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &accountsservice-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &accountsservice-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &accountsservice-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">AccountsService Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="polkit"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="systemd"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/> and
+      <xref linkend="xmlto"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/accountsservice"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of AccountsService</title>
+
+    <para>
+      Install <application>AccountsService</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr            \
+            --sysconfdir=/etc        \
+            --localstatedir=/var     \
+            --enable-admin-group=adm \
+            --disable-static         &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </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-admin-group=adm</parameter>: This switch sets
+      the group for administrator accounts.
+    </para>
+
+    <para>
+      <option>--enable-docbook-docs</option>: This switch enables building
+      the D-Bus interface API documentation.
+    </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="configuration">
+    <title>Configuring AccountsService</title>
+
+    <sect3  id="accountsservice-init">
+      <title>Systemd Units</title>
+
+      <para>
+        To start the <command>accounts-daemon</command> daemon at boot,
+        enable the previously installed systemd unit by
+        running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+      <indexterm zone="accountsservice accountsservice-init">
+        <primary sortas="f-accounts-daemon">accounts-daemon</primary>
+      </indexterm>
+
+<screen role="root"><userinput>systemctl enable accounts-daemon</userinput></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          accounts-daemon (library executable)
+        </seg>
+        <seg>
+          libaccountsservice.so
+        </seg>
+        <seg>
+          /usr/include/accountsservice-1.0,
+          /usr/share/doc/accountsservice,
+          /usr/share/gtk-doc/html/libaccountsservice, and
+          /var/lib/AccountsService
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="accounts-daemon">
+        <term><command>accounts-daemon</command></term>
+        <listitem>
+          <para>
+            is the <application>AccountsService</application> daemon.
+          </para>
+          <indexterm zone="accountsservice accounts-daemon">
+            <primary sortas="b-accounts-daemon">accounts-daemon</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libaccountsservice">
+        <term><filename class="libraryfile">libaccountsservice.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>AccountsService</application> API functions.
+          </para>
+          <indexterm zone="accountsservice libaccountsservice">
+            <primary sortas="c-libaccountsservice">libaccountsservice.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/sysutils/sysutils.xml
===================================================================
--- general/sysutils/sysutils.xml	(revision 192b96702833ffb164d198dbdfa26999678dd816)
+++ general/sysutils/sysutils.xml	(revision 14c2a270b587a1bc6417aa0e77763c18e9108d8a)
@@ -19,4 +19,7 @@
   some applications used by other applications in the book for
   installation or configuration purposes.</para>
+
+  <!--systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="accountsservice.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acpid.xml"/>
Index: gnome.ent
===================================================================
--- gnome.ent	(revision 192b96702833ffb164d198dbdfa26999678dd816)
+++ gnome.ent	(revision 14c2a270b587a1bc6417aa0e77763c18e9108d8a)
@@ -14,5 +14,4 @@
 <!-- Chapter 30 -->
 <!-- Platform -->
-<!ENTITY accountsservice-version      "0.6.45">
 <!ENTITY gsettings-desktop-schemas-version "3.24.1">
 <!ENTITY yelp-xsl-version             "3.20.1">
Index: ome/platform/accountsservice.xml
===================================================================
--- gnome/platform/accountsservice.xml	(revision 192b96702833ffb164d198dbdfa26999678dd816)
+++ 	(revision )
@@ -1,229 +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 accountsservice-download-http
-           "https://www.freedesktop.org/software/accountsservice/accountsservice-&accountsservice-version;.tar.xz">
-  <!ENTITY accountsservice-download-ftp  " ">
-  <!ENTITY accountsservice-md5sum        "b4c0a74bb5f8680dda0b7be27b1c02d9">
-  <!ENTITY accountsservice-size          "376 KB">
-  <!ENTITY accountsservice-buildsize     "11 MB">
-  <!ENTITY accountsservice-time          "0.1 SBU">
-]>
-
-<sect1 id="accountsservice" xreflabel="AccountsService-&accountsservice-version;" revision="systemd">
-  <?dbhtml filename="accountsservice.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>AccountsService-&accountsservice-version;</title>
-
-  <indexterm zone="accountsservice">
-    <primary sortas="a-AccountsService">AccountsService</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to AccountsService</title>
-
-    <para>
-      The <application>AccountsService</application> package provides a
-      set of <application>D-Bus</application> interfaces for querying
-      and manipulating user account information and an implementation
-      of those interfaces based on the usermod(8), useradd(8) and
-      userdel(8) commands.
-    </para>
-
-    &lfs81_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&accountsservice-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&accountsservice-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &accountsservice-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &accountsservice-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &accountsservice-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &accountsservice-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">AccountsService Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="polkit"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="systemd"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="xmlto"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/accountsservice"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of AccountsService</title>
-
-    <para>
-      Install <application>AccountsService</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr            \
-            --sysconfdir=/etc        \
-            --localstatedir=/var     \
-            --enable-admin-group=adm \
-            --disable-static         &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </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-admin-group=adm</parameter>: This switch sets
-      the group for administrator accounts.
-    </para>
-
-    <para>
-      <option>--enable-docbook-docs</option>: This switch enables building
-      the D-Bus interface API documentation.
-    </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="configuration">
-    <title>Configuring AccountsService</title>
-
-    <sect3  id="accountsservice-init">
-      <title>Systemd Units</title>
-
-      <para>
-        To start the <command>accounts-daemon</command> daemon at boot,
-        enable the previously installed systemd unit by
-        running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="accountsservice accountsservice-init">
-        <primary sortas="f-accounts-daemon">accounts-daemon</primary>
-      </indexterm>
-
-<screen role="root"><userinput>systemctl enable accounts-daemon</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          accounts-daemon (library executable)
-        </seg>
-        <seg>
-          libaccountsservice.so
-        </seg>
-        <seg>
-          /usr/include/accountsservice-1.0,
-          /usr/share/doc/accountsservice,
-          /usr/share/gtk-doc/html/libaccountsservice, and
-          /var/lib/AccountsService
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="accounts-daemon">
-        <term><command>accounts-daemon</command></term>
-        <listitem>
-          <para>
-            is the <application>AccountsService</application> daemon.
-          </para>
-          <indexterm zone="accountsservice accounts-daemon">
-            <primary sortas="b-accounts-daemon">accounts-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaccountsservice">
-        <term><filename class="libraryfile">libaccountsservice.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>AccountsService</application> API functions.
-          </para>
-          <indexterm zone="accountsservice libaccountsservice">
-            <primary sortas="c-libaccountsservice">libaccountsservice.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: gnome/platform/platform.xml
===================================================================
--- gnome/platform/platform.xml	(revision 192b96702833ffb164d198dbdfa26999678dd816)
+++ gnome/platform/platform.xml	(revision 14c2a270b587a1bc6417aa0e77763c18e9108d8a)
@@ -41,5 +41,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-platform.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="accountsservice.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gsettings-desktop-schemas.xml"/>
Index: packages.ent
===================================================================
--- packages.ent	(revision 192b96702833ffb164d198dbdfa26999678dd816)
+++ packages.ent	(revision 14c2a270b587a1bc6417aa0e77763c18e9108d8a)
@@ -250,4 +250,5 @@
 
 <!-- Chapter 12 -->
+<!ENTITY accountsservice-version      "0.6.45">
 <!ENTITY acpid-version                "2.0.28">
 <!ENTITY at-version                   "3.1.20">
