Index: lxde/desktop/lxde-common.xml
===================================================================
--- lxde/desktop/lxde-common.xml	(revision 787a2e751380085aa7f793a4c7c4499d23156678)
+++ lxde/desktop/lxde-common.xml	(revision f1ce80b098908521093ea35b4a35a9f1e4771411)
@@ -75,5 +75,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="consolekit"/>,
+      <phrase revision="sysv"><xref linkend="consolekit"/>,</phrase>
       <xref linkend="lxde-icon-theme"/>,
       <xref linkend="lxpanel"/>,
@@ -92,5 +92,5 @@
     <bridgehead renderas="sect4">Recommended Runtime Dependencies</bridgehead>
     <para role="recommended">
-      <xref linkend="consolekit"/> and
+      <phrase revision="sysv"><xref linkend="consolekit"/> and</phrase>
       <xref linkend="dbus"/>
     </para>
Index: lxde/desktop/lxsession.xml
===================================================================
--- lxde/desktop/lxsession.xml	(revision 787a2e751380085aa7f793a4c7c4499d23156678)
+++ lxde/desktop/lxsession.xml	(revision f1ce80b098908521093ea35b4a35a9f1e4771411)
@@ -71,6 +71,6 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
+    <bridgehead renderas="sect3" revision="sysv">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact" revision="sysv">
       <listitem>
         <para>
@@ -95,6 +95,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="consolekit"/> (used at runtime by
-      <command>lxsession-logout</command>),
+      <phrase revision="sysv"><xref linkend="consolekit"/> (used at runtime by
+      <command>lxsession-logout</command>),</phrase>
       <xref linkend="gtk3"/>, and
       <xref linkend="libxslt"/> with
@@ -111,10 +111,10 @@
     <title>Installation of LXSession</title>
 
-    <para>
+    <para revision="sysv">
       Optionally apply the following patch to be able to put your system
       into <quote>Suspend</quote> or <quote>Hibernate</quote> state.
     </para>
 
-<screen><userinput>patch -Np1 -i ../lxsession-&lxsession-version;-hibernate_consolekit-2.patch</userinput></screen>
+<screen revision="sysv"><userinput>patch -Np1 -i ../lxsession-&lxsession-version;-hibernate_consolekit-2.patch</userinput></screen>
 
     <para>
Index: lxqt/desktop/lxqt-common.xml
===================================================================
--- lxqt/desktop/lxqt-common.xml	(revision 787a2e751380085aa7f793a4c7c4499d23156678)
+++ lxqt/desktop/lxqt-common.xml	(revision f1ce80b098908521093ea35b4a35a9f1e4771411)
@@ -83,5 +83,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="consolekit"/> alone or with
+      <phrase revision="sysv"><xref linkend="consolekit"/> alone or with</phrase>
       <xref linkend="lxdm"/> or another Display Manager, e.g.
       <xref linkend="sddm"/> (this has been
Index: lxqt/desktop/post-install.xml
===================================================================
--- lxqt/desktop/post-install.xml	(revision 787a2e751380085aa7f793a4c7c4499d23156678)
+++ lxqt/desktop/post-install.xml	(revision f1ce80b098908521093ea35b4a35a9f1e4771411)
@@ -38,5 +38,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="consolekit"/> alone or with
+      <phrase revision="sysv"><xref linkend="consolekit"/> alone or with</phrase>
       <xref linkend="sddm"/> (this has been
       reported as the <quote>recommended <application>LXQt</application>
Index: multimedia/libdriv/pulseaudio.xml
===================================================================
--- multimedia/libdriv/pulseaudio.xml	(revision 787a2e751380085aa7f793a4c7c4499d23156678)
+++ multimedia/libdriv/pulseaudio.xml	(revision f1ce80b098908521093ea35b4a35a9f1e4771411)
@@ -100,5 +100,5 @@
       <xref linkend="bluez"/> (runtime),
       <xref linkend="check"/>,
-      <xref linkend="consolekit"/> (runtime),
+      <phrase revision="sysv"><xref linkend="consolekit"/> (runtime),</phrase>
       <xref linkend="GConf"/>,
       <xref linkend="gtk3"/>,
Index: networking/netutils/networkmanager.xml
===================================================================
--- networking/netutils/networkmanager.xml	(revision 787a2e751380085aa7f793a4c7c4499d23156678)
+++ networking/netutils/networkmanager.xml	(revision f1ce80b098908521093ea35b4a35a9f1e4771411)
@@ -89,5 +89,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="consolekit"/>,
+      <phrase revision="sysv"><xref linkend="consolekit"/>,</phrase>
       <xref linkend="dhcpcd"/> or
       <xref linkend="dhcp"/> (client only),
Index: packages.ent
===================================================================
--- packages.ent	(revision 787a2e751380085aa7f793a4c7c4499d23156678)
+++ packages.ent	(revision f1ce80b098908521093ea35b4a35a9f1e4771411)
@@ -19,4 +19,5 @@
 <!ENTITY iptables-version             "1.6.0">
 <!ENTITY libcap-version               "2.25">
+<!ENTITY liboauth-version             "1.0.3">
 <!ENTITY linux-pam-version            "1.3.0">
 <!ENTITY linux-pam-docs-version       "1.2.0">
Index: postlfs/config/config.xml
===================================================================
--- postlfs/config/config.xml	(revision 787a2e751380085aa7f793a4c7c4499d23156678)
+++ postlfs/config/config.xml	(revision f1ce80b098908521093ea35b4a35a9f1e4771411)
@@ -41,5 +41,5 @@
 
   <para> The remaining topics, <xref linkend="postlfs-config-logon"/>,
-  <xref linkend="postlfs-config-random"/>,
+  <phrase revision="sysv"><xref linkend="postlfs-config-random"/>,</phrase>
   <xref linkend="autofs"/>, and
   <xref linkend="postlfs-config-netfs"/> are then addressed, in that order. They
@@ -54,5 +54,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vimrc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="logon.xml"/>
+
+  <!-- sysv only -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="random.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lsb-release.xml"/>
 
Index: postlfs/config/random.xml
===================================================================
--- postlfs/config/random.xml	(revision 787a2e751380085aa7f793a4c7c4499d23156678)
+++ postlfs/config/random.xml	(revision f1ce80b098908521093ea35b4a35a9f1e4771411)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="postlfs-config-random" xreflabel="Random number generation">
+<sect1 id="postlfs-config-random" xreflabel="Random number generation" revision="sysv">
   <?dbhtml filename="random.html"?>
 
@@ -34,6 +34,5 @@
 
   <para>Install the <filename>/etc/rc.d/init.d/random</filename> init script
-  included with the <xref linkend="bootscripts" revision="sysv"/>
-  <xref linkend="systemd-units" revision="systemd"/> package.</para>
+  included with the <xref linkend="bootscripts"/> package.</para>
 
 <screen role="root"><userinput>make install-random</userinput></screen>
Index: postlfs/security/consolekit.xml
===================================================================
--- postlfs/security/consolekit.xml	(revision 787a2e751380085aa7f793a4c7c4499d23156678)
+++ postlfs/security/consolekit.xml	(revision f1ce80b098908521093ea35b4a35a9f1e4771411)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="consolekit" xreflabel="ConsoleKit2-&consolekit-version;">
+<sect1 id="consolekit" xreflabel="ConsoleKit2-&consolekit-version;" revision="sysv">
   <?dbhtml filename="consolekit.html"?>
 
Index: postlfs/security/liboauth.xml
===================================================================
--- postlfs/security/liboauth.xml	(revision f1ce80b098908521093ea35b4a35a9f1e4771411)
+++ postlfs/security/liboauth.xml	(revision f1ce80b098908521093ea35b4a35a9f1e4771411)
@@ -0,0 +1,190 @@
+<?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 liboauth-download-http "http://sourceforge.net/projects/liboauth/files/liboauth-&liboauth-version;.tar.gz">
+  <!ENTITY liboauth-download-ftp  " ">
+  <!ENTITY liboauth-md5sum        "689b46c2b3ab1a39735ac33f714c4f7f">
+  <!ENTITY liboauth-size          "496 KB">
+  <!ENTITY liboauth-buildsize     "3.5 MB">
+  <!ENTITY liboauth-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="liboauth" xreflabel="liboauth-&liboauth-version;" revision="systemd">
+  <?dbhtml filename="liboauth.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>liboauth-&liboauth-version;</title>
+
+  <indexterm zone="liboauth">
+    <primary sortas="a-liboauth">liboauth</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to liboauth</title>
+
+    <para>
+      <application>liboauth</application> is a collection of POSIX-C functions
+      implementing the OAuth Core RFC 5849 standard. Liboauth provides functions
+      to escape and encode parameters according to OAuth specification and
+      offers high-level functionality to sign requests or verify OAuth signatures
+      as well as perform HTTP requests.
+    </para>
+
+    <!-- &lfs77_checked; -->
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&liboauth-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&liboauth-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &liboauth-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &liboauth-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &liboauth-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &liboauth-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">liboauth Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="curl"/> and
+      <xref linkend="openssl"/> or
+      <xref linkend="nss"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/> (to build documentation)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/liboauth"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of liboauth</title>
+
+    <para>
+      Install <application>liboauth</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      If you have installed <xref linkend="doxygen"/>, issue
+      <command>make dox</command> to build the documentation.
+    </para>
+
+    <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>
+
+    <para>
+      If you have previously built the documentation, install it by
+      running the following commands as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -v -dm755 /usr/share/doc/liboauth-&liboauth-version; &amp;&amp;
+cp -rv doc/html/* /usr/share/doc/liboauth-&liboauth-version;</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>
+      <option>--enable-nss</option>: Use this switch if you want to
+      use Mozilla NSS instead of <application>OpenSSL</application>.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          liboauth.so
+        </seg>
+        <seg>
+          /usr/share/doc/liboauth-&liboauth-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="liboauth-lib">
+        <term><filename class="libraryfile">liboauth.so</filename></term>
+        <listitem>
+          <para>
+            provides functions to escape and encode stings according to
+            OAuth specifications and offers high-level functionality built
+            on top to sign requests or verify signatures using either NSS or
+            OpenSSL for calculating the hash/signatures.
+          </para>
+          <indexterm zone="liboauth liboauth-lib">
+            <primary sortas="c-liboauth">liboauth.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: postlfs/security/security.xml
===================================================================
--- postlfs/security/security.xml	(revision 787a2e751380085aa7f793a4c7c4499d23156678)
+++ postlfs/security/security.xml	(revision f1ce80b098908521093ea35b4a35a9f1e4771411)
@@ -43,5 +43,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vulnerabilities.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cacerts.xml"/>
+
+  <!-- sysv only -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="consolekit.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cracklib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cyrus-sasl.xml"/>
@@ -54,4 +57,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="linux-pam.xml"/>
+
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liboauth.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpwquality.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mitkrb.xml"/>
Index: x/dm/lxdm.xml
===================================================================
--- x/dm/lxdm.xml	(revision 787a2e751380085aa7f793a4c7c4499d23156678)
+++ x/dm/lxdm.xml	(revision f1ce80b098908521093ea35b4a35a9f1e4771411)
@@ -89,5 +89,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-     <xref linkend="consolekit"/> and
+     <phrase revision="sysv"><xref linkend="consolekit"/> and</phrase>
      <xref linkend="linux-pam"/>
     </para>
Index: x/dm/sddm.xml
===================================================================
--- x/dm/sddm.xml	(revision 787a2e751380085aa7f793a4c7c4499d23156678)
+++ x/dm/sddm.xml	(revision f1ce80b098908521093ea35b4a35a9f1e4771411)
@@ -95,6 +95,6 @@
     </para>
 
-    <bridgehead renderas="sect4">Runtime Dependencies</bridgehead>
-    <para role="required">
+    <bridgehead renderas="sect4" revision="sysv">Runtime Dependencies</bridgehead>
+    <para role="required" revision="sysv">
       <xref linkend="consolekit"/>
     </para>
Index: xfce/core/xfce4-session.xml
===================================================================
--- xfce/core/xfce4-session.xml	(revision 787a2e751380085aa7f793a4c7c4499d23156678)
+++ xfce/core/xfce4-session.xml	(revision f1ce80b098908521093ea35b4a35a9f1e4771411)
@@ -144,5 +144,5 @@
       There are several optional run time dependencies for
       <application>Xfce4</application>:
-      <xref linkend="consolekit"/>,
+      <phrase revision="sysv"><xref linkend="consolekit"/>,</phrase>
       <xref linkend="dbus"/>,
       <xref linkend="gnupg2"/>,
Index: xsoft/other/gparted.xml
===================================================================
--- xsoft/other/gparted.xml	(revision 787a2e751380085aa7f793a4c7c4499d23156678)
+++ xsoft/other/gparted.xml	(revision f1ce80b098908521093ea35b4a35a9f1e4771411)
@@ -186,5 +186,5 @@
     </sect3>
 
-    <sect3 role="pkexec">
+    <sect3 role="pkexec" revision="sysv">
       <title>pkexec</title>
         <para>
