Index: general/sysutils/dbus.xml
===================================================================
--- general/sysutils/dbus.xml	(revision 5ac58b540844ba8b5b31665b100ec20136a1fb2b)
+++ general/sysutils/dbus.xml	(revision 4ef4636b2b8c74ec9b850752c7ab247fb613d3a8)
@@ -84,4 +84,14 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3" revision="sysv">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact" revision="sysv">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/dbus-&dbus-version;-elogind-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">D-Bus Dependencies</bridgehead>
 
@@ -94,4 +104,6 @@
     <para role="recommended">
       <xref linkend="xorg7-lib"/> (for <command>dbus-launch</command> program)
+      <phrase revision="sysv">and <xref linkend="elogind"/> (first build
+      without, and then again after elogind is installed)</phrase>
     </para>
 
@@ -130,4 +142,10 @@
         -u 18 -g messagebus -s /bin/false messagebus</userinput></screen>
 
+    <para revision="sysv">
+      Apply a patch to fix detection of <application>elogind</application>:
+    </para>
+
+<screen revision="sysv"><userinput>patch -Np1 -i ../dbus-&dbus-version;-elogind-1.patch</userinput></screen>
+
     <para>
       Install <application>D-Bus</application> by running the following
@@ -137,17 +155,5 @@
     </para>
 
-<screen revision="sysv"><userinput>./configure --prefix=/usr                        \
-            --sysconfdir=/etc                    \
-            --localstatedir=/var                 \
-            --disable-doxygen-docs               \
-            --disable-xml-docs                   \
-            --disable-static                     \
-            --docdir=/usr/share/doc/dbus-&dbus-version; \
-            --with-console-auth-dir=/run/console \
-            --with-system-pid-file=/run/dbus/pid \
-            --with-system-socket=/run/dbus/system_bus_socket &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure --prefix=/usr                        \
+<screen><userinput>./configure --prefix=/usr                        \
             --sysconfdir=/etc                    \
             --localstatedir=/var                 \
@@ -187,5 +193,5 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para revision="systemd">
+    <para>
       The shared library needs to be moved to
       <filename class="directory">/lib</filename>, and as a result the
@@ -196,5 +202,5 @@
     </para>
 
-<screen revision="systemd" role="root"><userinput>mv -v /usr/lib/libdbus-1.so.* /lib &amp;&amp;
+<screen role="root"><userinput>mv -v /usr/lib/libdbus-1.so.* /lib &amp;&amp;
 ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</userinput></screen>
 
@@ -284,17 +290,9 @@
       href="../../xincludes/static-libraries.xml"/>
 
-    <para revision="sysv">
-      <parameter>--disable-systemd</parameter>: This switch disables systemd
-      support in <application>D-Bus</application>.
-    </para>
-
-    <para revision="sysv">
-      <parameter>--without-systemdsystemunitdir</parameter>: This switch
-      prevents installation of systemd unit files.
-    </para>
-
-    <para revision="systemd">
+    <para>
       <parameter>--enable-user-session</parameter>: This parameter enables
-      per-user DBus sessions with <application>systemd</application>.
+      per-user DBus sessions with
+      <phrase revision="sysv"><application>elogind</application>.</phrase>
+      <phrase revision="systemd"><application>systemd</application>.</phrase>
     </para>
 
Index: general/sysutils/elogind.xml
===================================================================
--- general/sysutils/elogind.xml	(revision 4ef4636b2b8c74ec9b850752c7ab247fb613d3a8)
+++ general/sysutils/elogind.xml	(revision 4ef4636b2b8c74ec9b850752c7ab247fb613d3a8)
@@ -0,0 +1,306 @@
+<?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 elogind-download-http "https://github.com/elogind/elogind/archive/v&elogind-version;/elogind-&elogind-version;.tar.gz">
+  <!ENTITY elogind-download-ftp  " ">
+  <!ENTITY elogind-md5sum        "468e027997be922aa11bfa395c7f1fb7">
+  <!ENTITY elogind-size          "1.1 MB">
+  <!ENTITY elogind-buildsize     "47 MB">
+  <!ENTITY elogind-time          "0.2 SBU">
+]>
+
+<sect1 id="elogind" revision="sysv" xreflabel="elogind-&elogind-version;">
+  <?dbhtml filename="elogind.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>elogind-&elogind-version;</title>
+
+  <indexterm zone="elogind">
+    <primary sortas="a-elogind">elogind</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to elogind</title>
+
+    <para>
+      <application>elogind</application> is the
+      <application>systemd</application> project's "logind", extracted out to
+      be a standalone daemon.  It integrates with <xref linkend="linux-pam"/>
+      to know the set of users that are logged in to a system and whether they
+      are logged in graphically, on the console, or remotely.
+      <application>Elogind</application> exposes this information via the
+      standard org.freedesktop.login1 <application>D-Bus</application>
+      interface, as well as through the file system using systemd's standard
+      <filename class="directory">/run/systemd</filename> layout.
+    </para>
+
+    &lfs83_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&elogind-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&elogind-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &elogind-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &elogind-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &elogind-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &elogind-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">elogind Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="dbus"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="DocBook"/>,
+      <xref linkend="docbook-xsl"/>, and
+      <xref linkend="libxslt"/> (to build the man pages),
+      <xref linkend="linux-pam"/>, and
+      <xref linkend="polkit"/> (runtime)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      For the tests:
+      <xref linkend="lxml"/>,
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="zsh"/>,
+      <xref linkend="valgrind"/>,
+      <ulink url="https://github.com/linux-audit/audit-userspace">
+      audit-userspace</ulink>,
+      <ulink url="https://github.com/scop/bash-completion">
+      bash-completion</ulink>,
+      <ulink url="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kexec/">
+      kexec</ulink>, and
+      <ulink url="http://www.selinuxproject.org/page/Main_Page">
+      SELinux</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/elogind"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of elogind</title>
+
+    <para>
+      Install <application>elogind</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd build    &amp;&amp;
+
+meson --prefix=/usr                        \
+      --sysconfdir=/etc                    \
+      --localstatedir=/var                 \
+      -Dcgroup-controller=elogind          \
+      -Ddbuspolicydir=/etc/dbus-1/system.d \
+      ..  &amp;&amp;
+ninja</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>ninja install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>-Dcgroup-controller=elogind</parameter>: This switch ensures
+      that <application>elogind</application> is selected as the cgroup
+      controller, even if booted with another running cgroup controller.
+    </para>
+
+    <para>
+      <parameter>-Ddbuspolicydir=/etc/dbus-1/system.d</parameter>: This switch
+      sets the location of the <application>D-Bus</application> policy
+      directory.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+  <title>Configuring elogind</title>
+
+    <para revision="sysv">
+      To automatically start <command>elogind</command> when the
+      system is rebooted, install the
+      <filename>/etc/rc.d/init.d/elogind</filename> bootscript from the
+      <xref linkend="bootscripts"/> package.
+    </para>
+
+    <indexterm zone="elogind elogind">
+      <primary sortas="f-elogind">elogind</primary>
+    </indexterm>
+
+<screen role="root"><userinput>make install-elogind</userinput></screen>
+
+    <para>
+      Note that this boot script only starts the system-wide
+      <application>elogind</application> daemon. Each user will also need to
+      register a user session using <application>Linux-PAM</application> at
+      login. The <filename>/etc/pam.d/system-session</filename> file needs to
+      be modified and a new file needs to be created in order for
+      <command>elogind</command> to work correctly. Run the following
+      commands as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>cat &gt;&gt; /etc/pam.d/system-session &lt;&lt; "EOF" &amp;&amp;
+# Begin elogind addition
+    
+session  required    pam_loginuid.so
+session  optional    pam_elogind.so
+
+# End elogind addition
+EOF
+cat &gt; /etc/pam.d/elogind-user &lt;&lt; "EOF"
+# Begin /etc/pam.d/elogind-user
+
+account  required    pam_access.so
+account  include     system-account
+
+session  required    pam_env.so
+session  required    pam_limits.so
+session  required    pam_unix.so
+session  required    pam_loginuid.so
+session  optional    pam_keyinit.so force revoke
+session  optional    pam_elogind.so
+
+auth     required    pam_deny.so
+password required    pam_deny.so
+
+# End /etc/pam.d/elogind-user
+EOF</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content" revision="sysv">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          busctl,
+          elogind-inhibit, and
+          loginctl
+        </seg>
+        <seg>
+           libelogind.so
+        </seg>
+        <seg>
+          /etc/elogind,
+          /usr/include/elogind, and
+          /usr/share/doc/elogind-&elogind-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="busctl">
+        <term><command>busctl</command></term>
+        <listitem>
+          <para>
+            is used to introspect and monitor the D-Bus bus.
+          </para>
+          <indexterm zone="elogind busctl">
+            <primary sortas="b-busctl">busctl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="elogind-inhibit">
+        <term><command>elogind-inhibit</command></term>
+        <listitem>
+          <para>
+            is used to execute a program with a shutdown, sleep or idle
+            inhibitor lock taken.
+          </para>
+          <indexterm zone="elogind elogind-inhibit">
+            <primary sortas="b-elogind-inhibit">elogind-inhibit</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="loginctl">
+        <term><command>loginctl</command></term>
+        <listitem>
+          <para>
+            is used to introspect and control the state of the elogind Login
+            Manger.
+          </para>
+          <indexterm zone="elogind loginctl">
+            <primary sortas="b-loginctl">loginctl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libelogind">
+        <term><filename class="libraryfile">libelogind.so</filename></term>
+        <listitem>
+          <para>
+            is the main elogind utility library.
+          </para>
+          <indexterm zone="elogind libelogind">
+            <primary sortas="c-libelogind">libelogind.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+  
+</sect1>
+
Index: general/sysutils/modemmanager.xml
===================================================================
--- general/sysutils/modemmanager.xml	(revision 5ac58b540844ba8b5b31665b100ec20136a1fb2b)
+++ general/sysutils/modemmanager.xml	(revision 4ef4636b2b8c74ec9b850752c7ab247fb613d3a8)
@@ -72,4 +72,14 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3" revision="sysv">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact" revision="sysv">
+      <listitem revision="sysv">
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/ModemManager-&ModemManager-version;-elogind-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">ModemManager Dependencies</bridgehead>
 
@@ -81,4 +91,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
+      <phrase revision="sysv"><xref linkend="elogind"/></phrase>
       <xref linkend="gobject-introspection"/>,
       <xref linkend="libmbim"/>,
@@ -101,4 +112,10 @@
     <title>Installation of ModemManager</title>
 
+    <para revision="sysv">
+      Apply a patch to correct elogind detection:
+    </para>
+
+<screen revision="sysv"><userinput>patch -Np1 -i ../ModemManager-&ModemManager-version;-elogind-1.patch</userinput></screen>
+
     <para>
       Install <application>ModemManager</application> by running the following
@@ -106,9 +123,11 @@
     </para>
 
-<screen revision="sysv"><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --localstatedir=/var \
+<screen revision="sysv"><userinput>
+./configure --prefix=/usr             \
+            --sysconfdir=/etc         \
+            --localstatedir=/var      \
+            --disable-static          \
             --enable-more-warnings=no \
-            --disable-static     &amp;&amp;
+            --with-elogind-suspend-resume=yes &amp;&amp;
 make</userinput></screen>
 
@@ -138,8 +157,14 @@
     <title>Command Explanations</title>
 
+    <para revision="sysv">
+      <parameter>--with-elogind-suspend-resume=yes</parameter>: This switch
+      forces <application>ModmeManager</application> to use the
+      <application>elogind</application> power management facilities.
+    </para>
+
     <para revision="systemd">
       <parameter>--with-systemd-suspend-resume</parameter>: This
-      switch forces <application>ModemManager</application> to use the systemd
-      power management facilities.
+      switch forces <application>ModemManager</application> to use the
+      <application>systemd</application> power management facilities.
     </para>
 
Index: general/sysutils/sysutils.xml
===================================================================
--- general/sysutils/sysutils.xml	(revision 5ac58b540844ba8b5b31665b100ec20136a1fb2b)
+++ general/sysutils/sysutils.xml	(revision 4ef4636b2b8c74ec9b850752c7ab247fb613d3a8)
@@ -34,4 +34,8 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
+
+  <!-- sysv only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="elogind.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="gpm.xml"/>
