Index: general/sysutils/autofs-systemd.xml
===================================================================
--- general/sysutils/autofs-systemd.xml	(revision 459c44945a5d1139d0d71fdfd2f0587a53c52d69)
+++ general/sysutils/autofs-systemd.xml	(revision 47e9f6b01492c69da93a339858cd416177dfc150)
@@ -137,6 +137,6 @@
 
     <para>
-      <option>--with-systemd</option>: This switch enables installation of the
-      systemd units.
+      <parameter>--with-systemd</parameter>: This switch enables installation of
+      the bundled systemd units.
     </para>
 
Index: general/sysutils/colord-systemd.xml
===================================================================
--- general/sysutils/colord-systemd.xml	(revision 459c44945a5d1139d0d71fdfd2f0587a53c52d69)
+++ general/sysutils/colord-systemd.xml	(revision 47e9f6b01492c69da93a339858cd416177dfc150)
@@ -136,6 +136,5 @@
             --enable-vala                \
             --disable-bash-completion    \
-            --disable-static             \
-            --with-systemdsystemunitdir=/lib/systemd/system &amp;&amp;
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
Index: general/sysutils/fcron-systemd.xml
===================================================================
--- general/sysutils/fcron-systemd.xml	(revision 47e9f6b01492c69da93a339858cd416177dfc150)
+++ general/sysutils/fcron-systemd.xml	(revision 47e9f6b01492c69da93a339858cd416177dfc150)
@@ -0,0 +1,308 @@
+<?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 fcron-download-http "http://fcron.free.fr/archives/fcron-&fcron-version;.src.tar.gz">
+  <!ENTITY fcron-download-ftp " ">
+<!--  <!ENTITY fcron-download-ftp "ftp://ftp.seul.org/pub/fcron/fcron-&fcron-version;.src.tar.gz">-->
+  <!ENTITY fcron-md5sum "4b031c2fba32a98fa814d1557158b0e9">
+  <!ENTITY fcron-size "584 KB">
+  <!ENTITY fcron-buildsize "5.1 MB">
+  <!ENTITY fcron-time "0.1 SBU">
+]>
+
+<sect1 id="fcron" xreflabel="Fcron-&fcron-version;">
+  <?dbhtml filename="fcron.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Fcron-&fcron-version;</title>
+
+  <indexterm zone="fcron">
+    <primary sortas="a-Fcron">Fcron</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Fcron</title>
+
+    <para>The <application>Fcron</application> package contains a periodical
+    command scheduler which aims at replacing <application>Vixie
+    Cron</application>.</para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&fcron-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&fcron-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &fcron-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &fcron-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &fcron-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &fcron-time;</para>
+      </listitem>
+    </itemizedlist>
+<!--
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/fcron-&fcron-version;-sendmail_upstream-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+-->
+    <bridgehead renderas="sect3">Fcron Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">An <xref linkend="server-mail"/>,
+    <ulink url="../postlfs/editors.html">text editor</ulink> (default is
+    <command>vi</command> from the <xref linkend="vim"/> package),
+    <xref linkend="linux-pam"/>, and
+    <xref linkend="docbook-utils"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/fcron"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Fcron</title>
+
+<!--    <para id="fcron-syslog"><application>Fcron</application> uses the cron facility
+    of <command>syslog</command> to log all messages. Since LFS
+    does not set up this facility in <filename>/etc/syslog.conf</filename>, it
+    needs to be done prior to installing <application>Fcron</application>. This
+    command will append the necessary line to the current
+    <filename>/etc/syslog.conf</filename> (perform as the
+    <systemitem class='username'>root</systemitem> user):</para>
+
+    <indexterm zone="fcron fcron-syslog">
+      <primary sortas="e-etc-syslog.conf">/etc/syslog.conf</primary>
+    </indexterm>
+
+<screen role="root"><userinput>cat &gt;&gt; /etc/syslog.conf &lt;&lt; "EOF"
+<literal># Begin fcron addition to /etc/syslog.conf
+
+cron.* -/var/log/cron.log
+
+# End fcron addition</literal>
+EOF</userinput></screen>
+
+    <para>The configuration file has been modified, so reloading the
+    <command>sysklogd</command> daemon will activate the changes (again as the
+    <systemitem class='username'>root</systemitem> user).</para>
+
+<screen role="root"><userinput>/etc/rc.d/init.d/sysklogd reload</userinput></screen> -->
+
+    <para>For security reasons, an unprivileged user and group for
+    <application>Fcron</application> should be created (perform as the
+    <systemitem class='username'>root</systemitem> user):</para>
+
+<screen role="root"><userinput>groupadd -g 22 fcron &amp;&amp;
+useradd -d /dev/null -c "Fcron User" -g fcron -s /bin/false -u 22 fcron</userinput></screen>
+
+    <para>Install <application>Fcron</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr          \
+            --sysconfdir=/etc      \
+            --localstatedir=/var   \
+            --without-sendmail     \
+            --with-boot-install=no &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>
+
+    <para>DESTDIR install must be done as <systemitem class="username">root</systemitem> user.</para>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+<!--
+    <para><command>autoconf</command>: This command is required to rebuild
+    <filename>configure</filename> using the fixed input file.</para>-->
+
+    <para><parameter>--without-sendmail</parameter>: By default,
+    <application>Fcron</application> will attempt to use the
+    <command>sendmail</command> command from an <xref linkend="server-mail"/>
+    package to email you the results of the <command>fcron</command> script.
+    This switch is used to disable default email notification. Omit the switch
+    to enable the default. Alternatively, you can use the
+    <option>--with-sendmail=<replaceable>&lt;/path/to/MTA
+    command&gt;</replaceable></option> to use a different mailer command.</para>
+
+    <para><parameter>--with-boot-install=no</parameter>: This prevents
+    installation of the bootscript included with the package.</para>
+
+    <para><option>--with-editor=<replaceable>&lt;/path/to/editor&gt;</replaceable></option>:
+    This switch allows you to set the default text editor.</para>
+
+    <para><option>--with-dsssl-dir=<replaceable>&lt;/path/to/dsssl-stylesheets&gt;</replaceable></option>:
+    May be used if you have <xref linkend="docbook-utils"/> installed.
+    Currently, the dsssl stylesheets are located at
+    <filename class="directory">/usr/share/sgml/docbook/dsssl-stylesheets-1.79</filename>.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Fcron</title>
+
+    <sect3 id="fcron-config">
+      <title>Config Files</title>
+
+      <para><filename>/etc/fcron.conf</filename>,
+      <filename>/etc/fcron.allow</filename>, and
+      <filename>/etc/fcron.deny</filename></para>
+
+      <indexterm zone="fcron fcron-config">
+        <primary sortas="e-etc-fcron.conf">/etc/fcron.conf</primary>
+      </indexterm>
+
+      <indexterm zone="fcron fcron-config">
+        <primary sortas="e-etc-fcron.allow">/etc/fcron.allow</primary>
+      </indexterm>
+
+      <indexterm zone="fcron fcron-config">
+        <primary sortas="e-etc-fcron.deny">/etc/fcron.deny</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>There are no required changes in any of the config files.
+      Configuration information can be found in the man page for
+      <filename>fcron.conf</filename>.</para>
+
+      <para><command>fcron</command> scripts are written using
+      <command>fcrontab</command>. Refer to the <command>fcrontab</command> man
+      page for proper parameters to address your situation.</para>
+
+      <para id="fcron-pam">If <application>Linux-PAM</application>
+      is installed, two PAM configuration files are installed in
+      <filename class='directory'>/etc/pam.d</filename>. Alternatively if
+      <filename class='directory'>/etc/pam.d</filename> is not used, the installation
+      will append two configuration sections to the existing
+      <filename>/etc/pam.conf</filename> file. You should ensure the files match your
+      preferences. Modify them as required to suit your needs.</para>
+
+      <indexterm zone="fcron fcron-pam">
+        <primary sortas="e-etc-pam.d">/etc/pam.d/*</primary>
+      </indexterm>
+
+      <indexterm zone="fcron fcron-pam">
+        <primary sortas="e-etc-pam.conf">/etc/pam.conf</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3  id="fcron-init">
+      <title>Systemd Unit</title>
+
+      <para>To start the <command>fcron</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="fcron fcron-init">
+        <primary sortas="f-fcron">fcron</primary>
+      </indexterm>
+
+<screen role="root"><userinput>systemctl enable fcron</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>fcron, fcrondyn, fcronsighup, and fcrontab</seg>
+        <seg>None</seg>
+        <seg>/usr/share/doc/fcron-&fcron-version; and /var/spool/fcron</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="fcron-prog">
+        <term><command>fcron</command></term>
+        <listitem>
+          <para>is the scheduling daemon.</para>
+          <indexterm zone="fcron fcron-prog">
+            <primary sortas="b-fcron">fcron</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fcrondyn">
+        <term><command>fcrondyn</command></term>
+        <listitem>
+          <para>is a user tool intended to interact with a running
+          <command>fcron</command> daemon.</para>
+          <indexterm zone="fcron fcrondyn">
+            <primary sortas="b-fcrondyn">fcrondyn</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fcronsighup">
+        <term><command>fcronsighup</command></term>
+        <listitem>
+          <para>instructs <command>fcron</command> to reread the
+          <application>Fcron</application> tables.</para>
+          <indexterm zone="fcron fcronsighup">
+            <primary sortas="b-fcronsighup">fcronsighup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fcrontab">
+        <term><command>fcrontab</command></term>
+        <listitem>
+          <para>is a program used to install, edit, list and remove the
+          tables used by <command>fcron</command>.</para>
+          <indexterm zone="fcron fcrontab">
+            <primary sortas="b-fcrontab">fcrontab</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/sysutils/fcron.xml
===================================================================
--- general/sysutils/fcron.xml	(revision 459c44945a5d1139d0d71fdfd2f0587a53c52d69)
+++ 	(revision )
@@ -1,312 +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 fcron-download-http "http://fcron.free.fr/archives/fcron-&fcron-version;.src.tar.gz">
-  <!ENTITY fcron-download-ftp " ">
-<!--  <!ENTITY fcron-download-ftp "ftp://ftp.seul.org/pub/fcron/fcron-&fcron-version;.src.tar.gz">-->
-  <!ENTITY fcron-md5sum "4b031c2fba32a98fa814d1557158b0e9">
-  <!ENTITY fcron-size "584 KB">
-  <!ENTITY fcron-buildsize "5.1 MB">
-  <!ENTITY fcron-time "0.1 SBU">
-]>
-
-<sect1 id="fcron" xreflabel="Fcron-&fcron-version;">
-  <?dbhtml filename="fcron.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Fcron-&fcron-version;</title>
-
-  <indexterm zone="fcron">
-    <primary sortas="a-Fcron">Fcron</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Fcron</title>
-
-    <para>The <application>Fcron</application> package contains a periodical
-    command scheduler which aims at replacing <application>Vixie
-    Cron</application>.</para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&fcron-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&fcron-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &fcron-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &fcron-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &fcron-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &fcron-time;</para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/fcron-&fcron-version;-sendmail_upstream-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Fcron Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">An <xref linkend="server-mail"/>,
-    <ulink url="../postlfs/editors.html">text editor</ulink> (default is
-    <command>vi</command> from the <xref linkend="vim"/> package),
-    <xref linkend="linux-pam"/>, and
-    <xref linkend="docbook-utils"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/fcron"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Fcron</title>
-
-    <para id="fcron-syslog"><application>Fcron</application> uses the cron facility
-    of <command>syslog</command> to log all messages. Since LFS
-    does not set up this facility in <filename>/etc/syslog.conf</filename>, it
-    needs to be done prior to installing <application>Fcron</application>. This
-    command will append the necessary line to the current
-    <filename>/etc/syslog.conf</filename> (perform as the
-    <systemitem class='username'>root</systemitem> user):</para>
-
-    <indexterm zone="fcron fcron-syslog">
-      <primary sortas="e-etc-syslog.conf">/etc/syslog.conf</primary>
-    </indexterm>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/syslog.conf &lt;&lt; "EOF"
-<literal># Begin fcron addition to /etc/syslog.conf
-
-cron.* -/var/log/cron.log
-
-# End fcron addition</literal>
-EOF</userinput></screen>
-
-    <para>The configuration file has been modified, so reloading the
-    <command>sysklogd</command> daemon will activate the changes (again as the
-    <systemitem class='username'>root</systemitem> user).</para>
-
-<screen role="root"><userinput>/etc/rc.d/init.d/sysklogd reload</userinput></screen>
-
-    <para>For security reasons, an unprivileged user and group for
-    <application>Fcron</application> should be created (perform as the
-    <systemitem class='username'>root</systemitem> user):</para>
-
-<screen role="root"><userinput>groupadd -g 22 fcron &amp;&amp;
-useradd -d /dev/null -c "Fcron User" -g fcron -s /bin/false -u 22 fcron</userinput></screen>
-
-    <para>Install <application>Fcron</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr          \
-            --sysconfdir=/etc      \
-            --localstatedir=/var   \
-            --without-sendmail     \
-            --with-boot-install=no \
-            --with-systemdsystemunitdir=no &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>
-
-    <para>DESTDIR install must be done as <systemitem class="username">root</systemitem> user.</para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-<!--
-    <para><command>autoconf</command>: This command is required to rebuild
-    <filename>configure</filename> using the fixed input file.</para>-->
-
-    <para><parameter>--without-sendmail</parameter>: By default,
-    <application>Fcron</application> will attempt to use the
-    <command>sendmail</command> command from an <xref linkend="server-mail"/>
-    package to email you the results of the <command>fcron</command> script.
-    This switch is used to disable default email notification. Omit the switch
-    to enable the default. Alternatively, you can use the
-    <option>--with-sendmail=<replaceable>&lt;/path/to/MTA
-    command&gt;</replaceable></option> to use a different mailer command.</para>
-
-    <para><parameter>--with-boot-install=no</parameter>: This prevents
-    installation of the bootscript included with the package.</para>
-
-    <para><parameter>--with-systemdsystemunitdir=no|yes|DIR</parameter>: Use
-    no, if you use sysvint; yes, if you use systemd, or specify the directory
-    DIR for the systemd units.</para>
-
-    <para><option>--with-editor=<replaceable>&lt;/path/to/editor&gt;</replaceable></option>:
-    This switch allows you to set the default text editor.</para>
-
-    <para><option>--with-dsssl-dir=<replaceable>&lt;/path/to/dsssl-stylesheets&gt;</replaceable></option>:
-    May be used if you have <xref linkend="docbook-utils"/> installed.
-    Currently, the dsssl stylesheets are located at
-    <filename class="directory">/usr/share/sgml/docbook/dsssl-stylesheets-1.79</filename>.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Fcron</title>
-
-    <sect3 id="fcron-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/fcron.conf</filename>,
-      <filename>/etc/fcron.allow</filename>, and
-      <filename>/etc/fcron.deny</filename></para>
-
-      <indexterm zone="fcron fcron-config">
-        <primary sortas="e-etc-fcron.conf">/etc/fcron.conf</primary>
-      </indexterm>
-
-      <indexterm zone="fcron fcron-config">
-        <primary sortas="e-etc-fcron.allow">/etc/fcron.allow</primary>
-      </indexterm>
-
-      <indexterm zone="fcron fcron-config">
-        <primary sortas="e-etc-fcron.deny">/etc/fcron.deny</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>There are no required changes in any of the config files.
-      Configuration information can be found in the man page for
-      <filename>fcron.conf</filename>.</para>
-
-      <para><command>fcron</command> scripts are written using
-      <command>fcrontab</command>. Refer to the <command>fcrontab</command> man
-      page for proper parameters to address your situation.</para>
-
-      <para id="fcron-pam">If <application>Linux-PAM</application>
-      is installed, two PAM configuration files are installed in
-      <filename class='directory'>/etc/pam.d</filename>. Alternatively if
-      <filename class='directory'>/etc/pam.d</filename> is not used, the installation
-      will append two configuration sections to the existing
-      <filename>/etc/pam.conf</filename> file. You should ensure the files match your
-      preferences. Modify them as required to suit your needs.</para>
-
-      <indexterm zone="fcron fcron-pam">
-        <primary sortas="e-etc-pam.d">/etc/pam.d/*</primary>
-      </indexterm>
-
-      <indexterm zone="fcron fcron-pam">
-        <primary sortas="e-etc-pam.conf">/etc/pam.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3  id="fcron-init">
-      <title>Boot Script</title>
-
-      <para>Install the <filename>/etc/rc.d/init.d/fcron</filename>
-      init script from the <xref linkend="bootscripts"/>
-      package.</para>
-
-      <indexterm zone="fcron fcron-init">
-        <primary sortas="f-fcron">fcron</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-fcron</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>fcron, fcrondyn, fcronsighup, and fcrontab</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/fcron-&fcron-version; and /var/spool/fcron</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fcron-prog">
-        <term><command>fcron</command></term>
-        <listitem>
-          <para>is the scheduling daemon.</para>
-          <indexterm zone="fcron fcron-prog">
-            <primary sortas="b-fcron">fcron</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fcrondyn">
-        <term><command>fcrondyn</command></term>
-        <listitem>
-          <para>is a user tool intended to interact with a running
-          <command>fcron</command> daemon.</para>
-          <indexterm zone="fcron fcrondyn">
-            <primary sortas="b-fcrondyn">fcrondyn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fcronsighup">
-        <term><command>fcronsighup</command></term>
-        <listitem>
-          <para>instructs <command>fcron</command> to reread the
-          <application>Fcron</application> tables.</para>
-          <indexterm zone="fcron fcronsighup">
-            <primary sortas="b-fcronsighup">fcronsighup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fcrontab">
-        <term><command>fcrontab</command></term>
-        <listitem>
-          <para>is a program used to install, edit, list and remove the
-          tables used by <command>fcron</command>.</para>
-          <indexterm zone="fcron fcrontab">
-            <primary sortas="b-fcrontab">fcrontab</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/sysstat-systemd.xml
===================================================================
--- general/sysutils/sysstat-systemd.xml	(revision 47e9f6b01492c69da93a339858cd416177dfc150)
+++ general/sysutils/sysstat-systemd.xml	(revision 47e9f6b01492c69da93a339858cd416177dfc150)
@@ -0,0 +1,301 @@
+<?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 sysstat-download-http "http://perso.wanadoo.fr/sebastien.godard/sysstat-&sysstat-version;.tar.xz">
+  <!ENTITY sysstat-download-ftp  " ">
+  <!ENTITY sysstat-md5sum        "85635dedac6802104a5737195d4effee">
+  <!ENTITY sysstat-size          "284 KB">
+  <!ENTITY sysstat-buildsize     "6.4 MB">
+  <!ENTITY sysstat-time          "0.1 SBU">
+]>
+
+<sect1 id="sysstat" xreflabel="Sysstat-&sysstat-version;">
+  <?dbhtml filename="sysstat.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Sysstat-&sysstat-version;</title>
+
+  <indexterm zone="sysstat">
+    <primary sortas="a-Sysstat">Sysstat</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Sysstat</title>
+
+    <para>The <application>Sysstat</application> package contains utilities
+    to monitor system performance and usage activity.
+    <application>Sysstat</application> contains the <command>sar</command>
+    utility, common to many commercial Unixes, and tools you can schedule via
+    cron to collect and historize performance and activity data.</para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&sysstat-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&sysstat-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &sysstat-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &sysstat-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &sysstat-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &sysstat-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Sysstat Dependencies</bridgehead>
+
+    <para>There are no build-time requirements for this package; however,
+    it is designed to be controlled by a cron daemon such as
+    <xref linkend="fcron"/>.</para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/sysstat"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Sysstat</title>
+
+    <para>Install <application>Sysstat</application> by running the
+    following commands:</para>
+
+<screen><userinput>sa_lib_dir=/usr/lib/sa    \
+sa_dir=/var/log/sa        \
+conf_dir=/etc/sysconfig   \
+./configure --prefix=/usr \
+            --disable-man-group &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>
+
+    <para>
+      Install the systemd unit by running the following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -v -m644 sysstat.service /lib/systemd/system/sysstat.service</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><envar>sa_lib_dir</envar>: This environment variable specifies the
+    location of the package-specific library directory.</para>
+
+    <para><envar>sa_dir</envar>: This environment variable specifies the
+    location of the directory containing the data files.</para>
+
+    <para><envar>conf_dir</envar>: This environment variable specifies the
+    location of the system configuration directory.</para>
+
+    <para><parameter>--disable-man-group</parameter>: This parameter causes
+    the installation to ignore the man group variable resulting in the man
+    files having
+    <systemitem class="username">root</systemitem>:<systemitem class="groupname">root</systemitem>
+    ownership.</para>
+
+    <note><para>Run <command>./configure --help</command> to see other influential
+    environment variables you can pass to <command>configure</command>. You may
+    want to use the <envar>history</envar> and <envar>compressafter</envar>
+    variables to customize the amount of data files kept on the system.</para></note>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Sysstat</title>
+
+    <sect3 id="sysstat-config">
+      <title>Config Files</title>
+
+      <para>
+        <filename>/etc/sysconfig/sysstat</filename> and
+        <filename>/etc/sysconfig/sysstat.ioconf</filename>
+      </para>
+
+      <indexterm zone="sysstat sysstat-config">
+        <primary sortas="e-etc-sysconfig-sysstat">/etc/sysconfig/sysstat</primary>
+      </indexterm>
+      <indexterm zone="sysstat sysstat-config">
+        <primary sortas="e-etc-sysconfig-sysstat.ioconf">/etc/sysconfig/sysstat.ioconf</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+     <title>Cron Information</title>
+
+      <para>To begin gathering <application>Sysstat</application> history
+      information, you must add to, or create a privileged user's crontab. The
+      history data location is
+      <filename class="directory">/var/log/sa</filename>. The user running
+      <application>Sysstat</application> utilities via cron must have write
+      access to this location.</para>
+
+      <para>Below is an example of what to install in the crontab. Adjust the
+      parameters to suit your needs. Use <command>man sa1</command> and
+      <command>man sa2</command> for information about the commands.</para>
+
+<screen><literal># 8am-7pm activity reports every 10 minutes during weekdays
+0 8-18 * * 1-5 /usr/lib/sa/sa1 600 6 &amp;
+
+# 7pm-8am activity reports every hour during weekdays
+0 19-7 * * 1-5 /usr/lib/sa/sa1 &amp;
+
+# Activity reports every hour on Saturday and Sunday
+0 * * * 0,6 /usr/lib/sa/sa1 &amp;
+
+# Daily summary prepared at 19:05
+5 19 * * * /usr/lib/sa/sa2 -A &amp;</literal></screen>
+
+    <para>Ensure you submit the revised crontab to the cron daemon.</para>
+
+    </sect3>
+
+    <sect3 id="sysstat-init">
+      <title>System Startup Information</title>
+
+      <indexterm zone="sysstat sysstat-init">
+        <primary sortas="f-sysstat">sysstat</primary>
+      </indexterm>
+
+      <para>At system startup, a LINUX RESTART message must be inserted in the
+      daily data file to reinitialize the kernel counters. This can be
+      automated by enabling the previously installed systemd unit
+      using the following command as the
+      <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>systemctl enable sysstat</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>cifsiostat, iostat, mpstat, nfsiostat-sysstat, pidstat, sadf,
+             and sar</seg>
+        <seg>None</seg>
+        <seg>/usr/lib/sa, 
+             /usr/share/doc/sysstat-&sysstat-version; and,
+             /var/log/sa
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="cifsiostat">
+        <term><command>cifsiostat</command></term>
+        <listitem>
+          <para>displays statistics about read and write operations on CIFS
+          filesystems.</para>
+          <indexterm zone="sysstat cifsiostat">
+            <primary sortas="b-cifsiostat">cifsiostat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="iostat">
+        <term><command>iostat</command></term>
+        <listitem>
+          <para>reports CPU statistics and input/output
+          statistics for devices and partitions.</para>
+          <indexterm zone="sysstat iostat">
+            <primary sortas="b-iostat">iostat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mpstat">
+        <term><command>mpstat</command></term>
+        <listitem>
+          <para>writes activities for each available processor.</para>
+          <indexterm zone="sysstat mpstat">
+            <primary sortas="b-mpstat">mpstat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="nfsiostat">
+        <term><command>nfsiostat-sysstat</command></term>
+        <listitem>
+          <para>displays statistics about read and write operations on NFS
+          filesystems.</para>
+          <indexterm zone="sysstat nfsiostat">
+            <primary sortas="b-nfsiostat">nfsiostat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pidstat">
+        <term><command>pidstat</command></term>
+        <listitem>
+          <para>is used for monitoring individual tasks currently being managed
+          by the Linux kernel.</para>
+          <indexterm zone="sysstat pidstat">
+            <primary sortas="b-pidstat">pidstat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sadf">
+        <term><command>sadf</command></term>
+        <listitem>
+          <para>is used for displaying the contents of data files created by
+          the <command>sar</command> command. But unlike
+          <command>sar</command>, <command>sadf</command> can write its data
+          in many different formats.</para>
+          <indexterm zone="sysstat sadf">
+            <primary sortas="b-sadf">sadf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sar">
+        <term><command>sar</command></term>
+        <listitem>
+          <para>is used for displaying the contents of elected cumulative activity
+          counters in the operating system.</para>
+          <indexterm zone="sysstat sar">
+            <primary sortas="b-sar">sar</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/sysutils/sysstat.xml
===================================================================
--- general/sysutils/sysstat.xml	(revision 459c44945a5d1139d0d71fdfd2f0587a53c52d69)
+++ 	(revision )
@@ -1,295 +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 sysstat-download-http "http://perso.wanadoo.fr/sebastien.godard/sysstat-&sysstat-version;.tar.xz">
-  <!ENTITY sysstat-download-ftp  " ">
-  <!ENTITY sysstat-md5sum        "85635dedac6802104a5737195d4effee">
-  <!ENTITY sysstat-size          "284 KB">
-  <!ENTITY sysstat-buildsize     "6.4 MB">
-  <!ENTITY sysstat-time          "0.1 SBU">
-]>
-
-<sect1 id="sysstat" xreflabel="Sysstat-&sysstat-version;">
-  <?dbhtml filename="sysstat.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Sysstat-&sysstat-version;</title>
-
-  <indexterm zone="sysstat">
-    <primary sortas="a-Sysstat">Sysstat</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Sysstat</title>
-
-    <para>The <application>Sysstat</application> package contains utilities
-    to monitor system performance and usage activity.
-    <application>Sysstat</application> contains the <command>sar</command>
-    utility, common to many commercial Unixes, and tools you can schedule via
-    cron to collect and historize performance and activity data.</para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&sysstat-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&sysstat-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &sysstat-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &sysstat-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &sysstat-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &sysstat-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Sysstat Dependencies</bridgehead>
-
-    <para>There are no build-time requirements for this package; however,
-    it is designed to be controlled by a cron daemon such as
-    <xref linkend="fcron"/>.</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/sysstat"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Sysstat</title>
-
-    <para>Install <application>Sysstat</application> by running the
-    following commands:</para>
-
-<screen><userinput>sa_lib_dir=/usr/lib/sa    \
-sa_dir=/var/log/sa        \
-conf_dir=/etc/sysconfig   \
-./configure --prefix=/usr \
-            --disable-man-group &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><envar>sa_lib_dir</envar>: This environment variable specifies the
-    location of the package-specific library directory.</para>
-
-    <para><envar>sa_dir</envar>: This environment variable specifies the
-    location of the directory containing the data files.</para>
-
-    <para><envar>conf_dir</envar>: This environment variable specifies the
-    location of the system configuration directory.</para>
-
-    <para><parameter>--disable-man-group</parameter>: This parameter causes
-    the installation to ignore the man group variable resulting in the man
-    files having
-    <systemitem class="username">root</systemitem>:<systemitem class="groupname">root</systemitem>
-    ownership.</para>
-
-    <note><para>Run <command>./configure --help</command> to see other influential
-    environment variables you can pass to <command>configure</command>. You may
-    want to use the <envar>history</envar> and <envar>compressafter</envar>
-    variables to customize the amount of data files kept on the system.</para></note>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Sysstat</title>
-
-    <sect3 id="sysstat-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/sysconfig/sysstat</filename> and
-        <filename>/etc/sysconfig/sysstat.ioconf</filename>
-      </para>
-
-      <indexterm zone="sysstat sysstat-config">
-        <primary sortas="e-etc-sysconfig-sysstat">/etc/sysconfig/sysstat</primary>
-      </indexterm>
-      <indexterm zone="sysstat sysstat-config">
-        <primary sortas="e-etc-sysconfig-sysstat.ioconf">/etc/sysconfig/sysstat.ioconf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-     <title>Cron Information</title>
-
-      <para>To begin gathering <application>Sysstat</application> history
-      information, you must add to, or create a privileged user's crontab. The
-      history data location is
-      <filename class="directory">/var/log/sa</filename>. The user running
-      <application>Sysstat</application> utilities via cron must have write
-      access to this location.</para>
-
-      <para>Below is an example of what to install in the crontab. Adjust the
-      parameters to suit your needs. Use <command>man sa1</command> and
-      <command>man sa2</command> for information about the commands.</para>
-
-<screen><literal># 8am-7pm activity reports every 10 minutes during weekdays
-0 8-18 * * 1-5 /usr/lib/sa/sa1 600 6 &amp;
-
-# 7pm-8am activity reports every hour during weekdays
-0 19-7 * * 1-5 /usr/lib/sa/sa1 &amp;
-
-# Activity reports every hour on Saturday and Sunday
-0 * * * 0,6 /usr/lib/sa/sa1 &amp;
-
-# Daily summary prepared at 19:05
-5 19 * * * /usr/lib/sa/sa2 -A &amp;</literal></screen>
-
-    <para>Ensure you submit the revised crontab to the cron daemon.</para>
-
-    </sect3>
-
-    <sect3 id="sysstat-init">
-      <title>System Startup Information</title>
-
-      <indexterm zone="sysstat sysstat-init">
-        <primary sortas="f-sysstat">sysstat</primary>
-      </indexterm>
-
-      <para>At system startup, a LINUX RESTART message must be inserted in the
-      daily data file to reinitialize the kernel counters. This can be
-      automated by installing the <filename>/etc/rc.d/init.d/sysstat</filename>
-      init script included in the <xref linkend="bootscripts"/>
-      package using the following command as the
-      <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install-sysstat</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>cifsiostat, iostat, mpstat, nfsiostat-sysstat, pidstat, sadf,
-             and sar</seg>
-        <seg>None</seg>
-        <seg>/usr/lib/sa, 
-             /usr/share/doc/sysstat-&sysstat-version; and,
-             /var/log/sa
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cifsiostat">
-        <term><command>cifsiostat</command></term>
-        <listitem>
-          <para>displays statistics about read and write operations on CIFS
-          filesystems.</para>
-          <indexterm zone="sysstat cifsiostat">
-            <primary sortas="b-cifsiostat">cifsiostat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iostat">
-        <term><command>iostat</command></term>
-        <listitem>
-          <para>reports CPU statistics and input/output
-          statistics for devices and partitions.</para>
-          <indexterm zone="sysstat iostat">
-            <primary sortas="b-iostat">iostat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mpstat">
-        <term><command>mpstat</command></term>
-        <listitem>
-          <para>writes activities for each available processor.</para>
-          <indexterm zone="sysstat mpstat">
-            <primary sortas="b-mpstat">mpstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nfsiostat">
-        <term><command>nfsiostat-sysstat</command></term>
-        <listitem>
-          <para>displays statistics about read and write operations on NFS
-          filesystems.</para>
-          <indexterm zone="sysstat nfsiostat">
-            <primary sortas="b-nfsiostat">nfsiostat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pidstat">
-        <term><command>pidstat</command></term>
-        <listitem>
-          <para>is used for monitoring individual tasks currently being managed
-          by the Linux kernel.</para>
-          <indexterm zone="sysstat pidstat">
-            <primary sortas="b-pidstat">pidstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sadf">
-        <term><command>sadf</command></term>
-        <listitem>
-          <para>is used for displaying the contents of data files created by
-          the <command>sar</command> command. But unlike
-          <command>sar</command>, <command>sadf</command> can write its data
-          in many different formats.</para>
-          <indexterm zone="sysstat sadf">
-            <primary sortas="b-sadf">sadf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sar">
-        <term><command>sar</command></term>
-        <listitem>
-          <para>is used for displaying the contents of elected cumulative activity
-          counters in the operating system.</para>
-          <indexterm zone="sysstat sar">
-            <primary sortas="b-sar">sar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/sysutils.xml
===================================================================
--- general/sysutils/sysutils.xml	(revision 459c44945a5d1139d0d71fdfd2f0587a53c52d69)
+++ general/sysutils/sysutils.xml	(revision 47e9f6b01492c69da93a339858cd416177dfc150)
@@ -27,5 +27,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cpio.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fcron.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fcron-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gpm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hdparm.xml"/>
@@ -44,12 +44,12 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sg3_utils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strigi.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysstat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysstat-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udev-extras.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udisks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udisks2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udisks-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udisks2-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unrar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="upower.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="upower-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="usbutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="which.xml"/>
Index: general/sysutils/udisks-systemd.xml
===================================================================
--- general/sysutils/udisks-systemd.xml	(revision 47e9f6b01492c69da93a339858cd416177dfc150)
+++ general/sysutils/udisks-systemd.xml	(revision 47e9f6b01492c69da93a339858cd416177dfc150)
@@ -0,0 +1,203 @@
+<?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 udisks-download-http "http://hal.freedesktop.org/releases/udisks-&udisks-version;.tar.gz">
+  <!ENTITY udisks-download-ftp  " ">
+  <!ENTITY udisks-md5sum        "70d48dcfe523a74cd7c7fbbc2847fcdd">
+  <!ENTITY udisks-size          "720 KB">
+  <!ENTITY udisks-buildsize     "12 MB">
+  <!ENTITY udisks-time          "0.1 SBU">
+]>
+
+<sect1 id="udisks" xreflabel="UDisks-&udisks-version;">
+  <?dbhtml filename="udisks.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>UDisks-&udisks-version;</title>
+
+  <indexterm zone="udisks">
+    <primary sortas="a-UDisks">UDisks</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to UDisks</title>
+
+    <para>
+      The <application>UDisks</application> package provides a
+      storage daemon that implements well-defined D-Bus interfaces
+      that can be used to query and manipulate storage devices.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&udisks-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&udisks-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &udisks-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &udisks-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &udisks-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &udisks-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">udisks Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="dbus-glib"/>,
+      <xref linkend="libatasmart"/>,
+      <xref linkend="lvm2"/>,
+      <xref linkend="parted"/>,
+      <xref linkend="polkit"/>,
+      <xref linkend="sg3_utils"/>, and
+      <xref linkend="systemd"/> (for GUdev and Logind)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="libxslt"/> and
+      <xref linkend="sudo"/> (to run the test)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/udisks"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of UDisks</title>
+
+    <para>
+      Install <application>UDisks</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr        \
+            --sysconfdir=/etc    \
+            --localstatedir=/var &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 profiledir=/etc/bash_completion.d install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+   <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>
+          udisks, 
+          udisks-daemon, 
+          udisks-tcp-bridge, and
+          umount.udisks
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/gtk-doc/html/udisks and
+          /var/lib/udisks
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="udisks-prog">
+        <term><command>udisks</command></term>
+        <listitem>
+          <para>
+            is a simple command line interface for the
+            <application>UDisks</application> Daemon.
+          </para>
+          <indexterm zone="udisks udisks-prog">
+            <primary sortas="b-udisks">udisks</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="udisks-tcp-bridge">
+        <term><command>udisks-tcp-bridge</command></term>
+        <listitem>
+          <para>
+            is the <application>UDisks</application> TCP/IP bridge.
+          </para>
+          <indexterm zone="udisks udisks-tcp-bridge">
+            <primary sortas="b-udisks-tcp-bridge">udisks-tcp-bridge</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="udisks-daemon">
+        <term><command>udisks-daemon</command></term>
+        <listitem>
+          <para>
+            is the <application>UDisks</application> Daemon.
+          </para>
+          <indexterm zone="udisks udisks-daemon">
+            <primary sortas="b-udisks-daemon">udisks-daemon</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/sysutils/udisks.xml
===================================================================
--- general/sysutils/udisks.xml	(revision 459c44945a5d1139d0d71fdfd2f0587a53c52d69)
+++ 	(revision )
@@ -1,203 +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 udisks-download-http "http://hal.freedesktop.org/releases/udisks-&udisks-version;.tar.gz">
-  <!ENTITY udisks-download-ftp  " ">
-  <!ENTITY udisks-md5sum        "70d48dcfe523a74cd7c7fbbc2847fcdd">
-  <!ENTITY udisks-size          "720 KB">
-  <!ENTITY udisks-buildsize     "12 MB">
-  <!ENTITY udisks-time          "0.1 SBU">
-]>
-
-<sect1 id="udisks" xreflabel="UDisks-&udisks-version;">
-  <?dbhtml filename="udisks.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>UDisks-&udisks-version;</title>
-
-  <indexterm zone="udisks">
-    <primary sortas="a-UDisks">UDisks</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to UDisks</title>
-
-    <para>
-      The <application>UDisks</application> package provides a
-      storage daemon that implements well-defined D-Bus interfaces
-      that can be used to query and manipulate storage devices.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&udisks-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&udisks-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &udisks-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &udisks-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &udisks-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &udisks-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">udisks Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="libatasmart"/>,
-      <xref linkend="lvm2"/>,
-      <xref linkend="parted"/>,
-      <xref linkend="polkit"/>,
-      <xref linkend="sg3_utils"/>, and
-      <xref linkend="udev-extras"/> (for gudev)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libxslt"/> and
-      <xref linkend="sudo"/> (to run the test)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/udisks"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of UDisks</title>
-
-    <para>
-      Install <application>UDisks</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --localstatedir=/var &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 profiledir=/etc/bash_completion.d install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-   <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>
-          udisks, 
-          udisks-daemon, 
-          udisks-tcp-bridge, and
-          umount.udisks
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/gtk-doc/html/udisks and
-          /var/lib/udisks
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="udisks-prog">
-        <term><command>udisks</command></term>
-        <listitem>
-          <para>
-            is a simple command line interface for the
-            <application>UDisks</application> Daemon.
-          </para>
-          <indexterm zone="udisks udisks-prog">
-            <primary sortas="b-udisks">udisks</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="udisks-tcp-bridge">
-        <term><command>udisks-tcp-bridge</command></term>
-        <listitem>
-          <para>
-            is the <application>UDisks</application> TCP/IP bridge.
-          </para>
-          <indexterm zone="udisks udisks-tcp-bridge">
-            <primary sortas="b-udisks-tcp-bridge">udisks-tcp-bridge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="udisks-daemon">
-        <term><command>udisks-daemon</command></term>
-        <listitem>
-          <para>
-            is the <application>UDisks</application> Daemon.
-          </para>
-          <indexterm zone="udisks udisks-daemon">
-            <primary sortas="b-udisks-daemon">udisks-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/udisks2-systemd.xml
===================================================================
--- general/sysutils/udisks2-systemd.xml	(revision 47e9f6b01492c69da93a339858cd416177dfc150)
+++ general/sysutils/udisks2-systemd.xml	(revision 47e9f6b01492c69da93a339858cd416177dfc150)
@@ -0,0 +1,207 @@
+<?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 udisks2-download-http "http://udisks.freedesktop.org/releases/udisks-&udisks2-version;.tar.bz2">
+  <!ENTITY udisks2-download-ftp  " ">
+  <!ENTITY udisks2-md5sum        "f2c793f839058371d1e93a654199438d">
+  <!ENTITY udisks2-size          "892 KB">
+  <!ENTITY udisks2-buildsize     "40 MB (additional 1 MB for the tests and
+                                  46 MB for docs creation)">
+  <!ENTITY udisks2-time          "0.3 SBU (additional 0.1 SBU for docs creation)">
+]>
+
+<sect1 id="udisks2" xreflabel="UDisks-&udisks2-version;">
+  <?dbhtml filename="udisks2.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>UDisks-&udisks2-version;</title>
+
+  <indexterm zone="udisks2">
+    <primary sortas="a-UDisks">UDisks2</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to UDisks</title>
+
+    <para>
+      The <application>UDisks</application> package provides a daemon,
+      tools and libraries to access and manipulate disks and storage
+      devices.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&udisks2-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&udisks2-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &udisks2-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &udisks2-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &udisks2-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &udisks2-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">UDisks Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libatasmart"/>,
+      <xref linkend="libxslt"/>,
+      <xref linkend="polkit"/>,  and
+      <xref linkend="systemd"/> (for GUdev and Logind)
+    </para>
+
+    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
+    <para role="optional">
+      <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;/udisks2"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of UDisks</title>
+
+    <para>
+      Install <application>UDisks</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr        \
+            --sysconfdir=/etc    \
+            --localstatedir=/var \
+            --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.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          udisksctl, udisksd and umount.udisks2
+        </seg>
+        <seg>
+          libudisks2.so
+        </seg>
+        <seg>
+          /etc/udisks2,
+          /usr/include/udisks2,
+          /usr/lib/udisks2,
+          /usr/share/gtk-doc/html/udisks2 and
+          /var/lib/udisks2
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="udisksctl">
+        <term><command>udisksctl</command></term>
+        <listitem>
+          <para>
+            is a command-line program used to interact with the
+            <command>udisksd</command> daemon.
+          </para>
+          <indexterm zone="udisks2 udisksctl">
+            <primary sortas="b-udisksctl">udisksctl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="udisksd">
+        <term><command>udisksd</command></term>
+        <listitem>
+          <para>
+            is the <application>UDisks</application> daemon itself.
+          </para>
+          <indexterm zone="udisks2 udisksd">
+            <primary sortas="b-udisksd">udisksd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libudisks2">
+        <term><filename class="libraryfile">libudisks2.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>UDisks</application> API functions.
+          </para>
+          <indexterm zone="udisks2 libudisks2">
+            <primary sortas="c-libudisks2">libudisks2.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/sysutils/udisks2.xml
===================================================================
--- general/sysutils/udisks2.xml	(revision 459c44945a5d1139d0d71fdfd2f0587a53c52d69)
+++ 	(revision )
@@ -1,207 +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 udisks2-download-http "http://udisks.freedesktop.org/releases/udisks-&udisks2-version;.tar.bz2">
-  <!ENTITY udisks2-download-ftp  " ">
-  <!ENTITY udisks2-md5sum        "f2c793f839058371d1e93a654199438d">
-  <!ENTITY udisks2-size          "892 KB">
-  <!ENTITY udisks2-buildsize     "40 MB (additional 1 MB for the tests and
-                                  46 MB for docs creation)">
-  <!ENTITY udisks2-time          "0.3 SBU (additional 0.1 SBU for docs creation)">
-]>
-
-<sect1 id="udisks2" xreflabel="UDisks-&udisks2-version;">
-  <?dbhtml filename="udisks2.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>UDisks-&udisks2-version;</title>
-
-  <indexterm zone="udisks2">
-    <primary sortas="a-UDisks">UDisks2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to UDisks</title>
-
-    <para>
-      The <application>UDisks</application> package provides a daemon,
-      tools and libraries to access and manipulate disks and storage
-      devices.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&udisks2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&udisks2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &udisks2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &udisks2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &udisks2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &udisks2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">UDisks Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libatasmart"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="polkit"/>,  and
-      <xref linkend="udev-extras"/> (for GUdev)
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
-    <para role="optional">
-      <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;/udisks2"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of UDisks</title>
-
-    <para>
-      Install <application>UDisks</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --localstatedir=/var \
-            --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.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          udisksctl, udisksd and umount.udisks2
-        </seg>
-        <seg>
-          libudisks2.so
-        </seg>
-        <seg>
-          /etc/udisks2,
-          /usr/include/udisks2,
-          /usr/lib/udisks2,
-          /usr/share/gtk-doc/html/udisks2 and
-          /var/lib/udisks2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="udisksctl">
-        <term><command>udisksctl</command></term>
-        <listitem>
-          <para>
-            is a command-line program used to interact with the
-            <command>udisksd</command> daemon.
-          </para>
-          <indexterm zone="udisks2 udisksctl">
-            <primary sortas="b-udisksctl">udisksctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="udisksd">
-        <term><command>udisksd</command></term>
-        <listitem>
-          <para>
-            is the <application>UDisks</application> daemon itself.
-          </para>
-          <indexterm zone="udisks2 udisksd">
-            <primary sortas="b-udisksd">udisksd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libudisks2">
-        <term><filename class="libraryfile">libudisks2.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>UDisks</application> API functions.
-          </para>
-          <indexterm zone="udisks2 libudisks2">
-            <primary sortas="c-libudisks2">libudisks2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/upower-systemd.xml
===================================================================
--- general/sysutils/upower-systemd.xml	(revision 47e9f6b01492c69da93a339858cd416177dfc150)
+++ general/sysutils/upower-systemd.xml	(revision 47e9f6b01492c69da93a339858cd416177dfc150)
@@ -0,0 +1,245 @@
+<?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 upower-download-http "http://upower.freedesktop.org/releases/upower-&upower-version;.tar.xz">
+  <!ENTITY upower-download-ftp  " ">
+  <!ENTITY upower-md5sum        "39cfd97bfaf7d30908f20cf937a57634">
+  <!ENTITY upower-size          "416 KB">
+  <!ENTITY upower-buildsize     "10 MB">
+  <!ENTITY upower-time          "0.2 SBU">
+]>
+
+<sect1 id="upower" xreflabel="UPower-&upower-version;">
+  <?dbhtml filename="upower.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>UPower-&upower-version;</title>
+
+  <indexterm zone="upower">
+    <primary sortas="a-UPower">UPower</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to UPower</title>
+
+    <para>
+      The <application>UPower</application> package provides an interface to
+      enumerating power devices, listening to device events and querying history
+      and statistics. Any application or service on the system can access the
+      org.freedesktop.UPower service via the system message bus.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&upower-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&upower-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &upower-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &upower-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &upower-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &upower-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">UPower Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="dbus-glib"/>,
+      <xref linkend="libusb"/>,
+      <xref linkend="polkit"/>, and
+      <xref linkend="systemd"/> (for GUdev and Logind)
+    </para>
+
+    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/> and
+      <xref linkend="python3"/> (used only in the testsuite).
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/upower"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of UPower</title>
+
+    <para>
+      Install <application>UPower</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr        \
+            --sysconfdir=/etc    \
+            --localstatedir=/var \
+            --disable-static     \
+            --with-systemdsystemunitdir=/lib/systemd/system &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>. Some
+      checks may not pass due to missing files. Test suite should be run from
+      a local GUI session started with dbus-launch.
+    </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"/>
+
+    <para>
+      <parameter>--with-systemdsystemunitdir=/lib/systemd/system</parameter>:
+      This switch specifies the install location for the systemd units.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring your kernel for UPower</title>
+
+    <para>
+      To use the command <command>upower -w</command> for information about
+      processor wakeups (this command is used by <ulink
+      url="http://ftp.gnome.org/pub/gnome/sources/gnome-power-manager/">gnome-power-manager</ulink>)
+      you need to enable CONFIG_TIMER_STATS.  This is achieved in
+      <command>make menuconfig</command> by going to the &apos;kernel-hacking&apos;
+      menu and selecting &apos;Collect kernel timers statistics&apos;.
+    </para>
+
+    <sect3  id="upower-init">
+      <title>Systemd Unit</title>
+
+      <para>To start the <command>upowerd</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="upower upower-init">
+        <primary sortas="f-upower">upower</primary>
+      </indexterm>
+
+<screen role="root"><userinput>systemctl enable upower</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>
+          upower and upowerd
+        </seg>
+        <seg>
+          libupower-glib.so
+        </seg>
+        <seg>
+          /etc/UPower,
+          /usr/include/libupower-glib, and
+          /var/lib/upower
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="upower-prog">
+        <term><command>upower</command></term>
+        <listitem>
+          <para>
+            is the <application>UPower</application> command line tool.
+          </para>
+          <indexterm zone="upower upower-prog">
+            <primary sortas="b-upower">upower</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="upowerd">
+        <term><command>upowerd</command></term>
+        <listitem>
+          <para>
+            is the <application>UPower</application> Daemon. It provides the
+            org.freedesktop.UPower service on the system message bus.
+          </para>
+          <indexterm zone="upower upowerd">
+            <primary sortas="b-upowerd">upowerd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libupower-glib">
+        <term><filename class="libraryfile">libupower-glib.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>UPower</application> API functions.
+          </para>
+          <indexterm zone="upower libupower-glib">
+            <primary sortas="c-libupower-glib">libupower-glib.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/sysutils/upower.xml
===================================================================
--- general/sysutils/upower.xml	(revision 459c44945a5d1139d0d71fdfd2f0587a53c52d69)
+++ 	(revision )
@@ -1,233 +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 upower-download-http "http://upower.freedesktop.org/releases/upower-&upower-version;.tar.xz">
-  <!ENTITY upower-download-ftp  " ">
-  <!ENTITY upower-md5sum        "39cfd97bfaf7d30908f20cf937a57634">
-  <!ENTITY upower-size          "416 KB">
-  <!ENTITY upower-buildsize     "10 MB">
-  <!ENTITY upower-time          "0.2 SBU">
-]>
-
-<sect1 id="upower" xreflabel="UPower-&upower-version;">
-  <?dbhtml filename="upower.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>UPower-&upower-version;</title>
-
-  <indexterm zone="upower">
-    <primary sortas="a-UPower">UPower</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to UPower</title>
-
-    <para>
-      The <application>UPower</application> package provides an interface to
-      enumerating power devices, listening to device events and querying history
-      and statistics. Any application or service on the system can access the
-      org.freedesktop.UPower service via the system message bus.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&upower-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&upower-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &upower-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &upower-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &upower-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &upower-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">UPower Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="libusb"/>,
-      <xref linkend="polkit"/>, and
-      <xref linkend="udev-extras"/> (for GUdev)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (runtime)</bridgehead>
-    <para role="recommended">
-      <xref linkend="pm-utils"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
-    <para role="optional">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="python3"/> (used only in the testsuite).
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/upower"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of UPower</title>
-
-    <para>
-      Install <application>UPower</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --localstatedir=/var \
-            --enable-deprecated  \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. Some
-      checks may not pass due to missing files. Test suite should be run from
-      a local GUI session started with dbus-launch.
-    </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>
-      <option>--enable-deprecated</option>: This switch enables
-      deprecated functionality which is still needed by some
-      applications.
-    </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 your kernel for UPower</title>
-
-    <para>
-      To use the command <command>upower -w</command> for information about
-      processor wakeups (this command is used by <ulink url="http://ftp.gnome.org/pub/gnome/sources/gnome-power-manager/">gnome-power-manager</ulink>)
-      you need to enable CONFIG_TIMER_STATS.  This is achieved in
-      <command>make menuconfig</command> by going to the &apos;kernel-hacking&apos;
-      menu and selecting &apos;Collect kernel timers statistics&apos;.
-    </para>
-
-  </sect2>
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          upower and upowerd
-        </seg>
-        <seg>
-          libupower-glib.so
-        </seg>
-        <seg>
-          /etc/UPower,
-          /usr/include/libupower-glib, and
-          /var/lib/upower
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="upower-prog">
-        <term><command>upower</command></term>
-        <listitem>
-          <para>
-            is the <application>UPower</application> command line tool.
-          </para>
-          <indexterm zone="upower upower-prog">
-            <primary sortas="b-upower">upower</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="upowerd">
-        <term><command>upowerd</command></term>
-        <listitem>
-          <para>
-            is the <application>UPower</application> Daemon. It provides the
-            org.freedesktop.UPower service on the system message bus.
-          </para>
-          <indexterm zone="upower upowerd">
-            <primary sortas="b-upowerd">upowerd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libupower-glib">
-        <term><filename class="libraryfile">libupower-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>UPower</application> API functions.
-          </para>
-          <indexterm zone="upower libupower-glib">
-            <primary sortas="c-libupower-glib">libupower-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
