Index: lxde/desktop/lxde-common.xml
===================================================================
--- lxde/desktop/lxde-common.xml	(revision 7991b1f8b85837e00e84f2b9a017f5fb3b08c24b)
+++ lxde/desktop/lxde-common.xml	(revision f677c498aeb5a0df17b0a1891d6c151287736ec6)
@@ -91,5 +91,5 @@
     <bridgehead renderas="sect4">Recommended Runtime Dependencies</bridgehead>
     <para role="recommended">
-      <xref role="runtime" linkend="lxpolkit"/> or
+      <xref linkend="lxsession"/> (for <application>lxpolkit</application>) or
       <xref linkend="polkit-gnome"/>
     </para>
@@ -179,13 +179,4 @@
 
     <screen><userinput>startx &amp;&gt; ~/.x-session-errors</userinput></screen>
-
-    <note revision="sysv">
-      <para>
-        You may wish to drop consolekit, just using
-        startlxde in ~/.xinitrc. However some capabilities such as mounting or
-        umounting file systems from a file manager will not be available, or
-        the reboot option will be absent or inoperative, among other problems.
-      </para>
-    </note>
 
     <para>
Index: de/desktop/lxpolkit.xml
===================================================================
--- lxde/desktop/lxpolkit.xml	(revision 7991b1f8b85837e00e84f2b9a017f5fb3b08c24b)
+++ 	(revision )
@@ -1,166 +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 lxpolkit-download-http "&sourceforge-dl;/lxde/lxpolkit-&lxpolkit-version;.tar.xz">
-  <!ENTITY lxpolkit-download-ftp  " ">
-  <!ENTITY lxpolkit-md5sum        "2597b00035fe1d695219e0f9bfa8c26f">
-  <!ENTITY lxpolkit-size          "200 KB">
-  <!ENTITY lxpolkit-buildsize     "2.7 MB">
-  <!ENTITY lxpolkit-time          "0.1 SBU">
-]>
-
-<sect1 id="lxpolkit" xreflabel="LXPolkit-&lxpolkit-version;">
-  <?dbhtml filename="lxpolkit.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>LXPolkit-&lxpolkit-version;</title>
-
-  <indexterm zone="lxpolkit">
-    <primary sortas="a-LXPolkit">LXPolkit</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LXPolkit</title>
-
-    <para>
-      The <application>LXPolkit</application> package contains the default
-      <application>Polkit</application> authentication agent for
-      <application>LXDE</application>.
-    </para>
-
-    &lfs84_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxpolkit-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxpolkit-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxpolkit-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxpolkit-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxpolkit-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxpolkit-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LXPolkit Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="polkit"/> and <xref linkend="gtk2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxpolkit"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LXPolkit</title>
-
-    <para>
-      Install <application>LXPolkit</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &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>
-      <option>--enable-gtk3</option>: Builds against <application>GTK+-3
-      </application> instead of <application>GTK+-2</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxpolkit
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/lxpolkit
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxpolkit">
-        <term><command>lxpolkit</command></term>
-        <listitem>
-          <para>
-            a simple <application>Polkit</application> authentication daemon.
-          </para>
-          <indexterm zone="lxpolkit lxpolkit">
-            <primary sortas="b-lxpolkit-default">lxpolkit-default</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lxde/desktop/lxsession.xml
===================================================================
--- lxde/desktop/lxsession.xml	(revision 7991b1f8b85837e00e84f2b9a017f5fb3b08c24b)
+++ lxde/desktop/lxsession.xml	(revision f677c498aeb5a0df17b0a1891d6c151287736ec6)
@@ -79,10 +79,4 @@
       <xref linkend="polkit"/>, and
       <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="lxpolkit"/> or <xref linkend="polkit-gnome"/> (required
-      at runtime by lxsession-logout)
     </para>
 
@@ -139,4 +133,40 @@
       is required anyway by <application>libunique</application>.
     </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring LXSession</title>
+
+    <sect3>
+
+      <title>Automatic Startup</title>
+
+      <para>
+        If <xref linkend="polkit-gnome"/> is not installed,
+        the <application>lxpolkit</application> authentification agent
+        needs to be started.
+      </para>
+
+      <para>
+        Issue the following commands as the
+        <systemitem class="username">root</systemitem> user to create
+        a startup file for <application>lxpolkit</application>:
+     </para>
+
+<screen role="root"><userinput>mkdir -p /etc/xdg/autostart &amp;&amp;
+cat &gt; /etc/xdg/autostart/lxpolkit.desktop &lt;&lt; "EOF"
+[Desktop Entry]
+Type=Application
+Name=LXPolKit
+Comment=Policykit Authentication Agent
+Exec=lxpolkit
+TryExec=lxpolkit
+Icon=gtk-dialog-authentication
+NotShowIn=GNOME;KDE;MATE;
+Hidden=true
+EOF</userinput></screen>
+
+    </sect3>
 
   </sect2>
Index: packages.ent
===================================================================
--- packages.ent	(revision 7991b1f8b85837e00e84f2b9a017f5fb3b08c24b)
+++ packages.ent	(revision f677c498aeb5a0df17b0a1891d6c151287736ec6)
@@ -814,5 +814,4 @@
 <!ENTITY lxpanel-version              "0.10.0">
 <!ENTITY lxappearance-version         "0.6.3">
-<!ENTITY lxpolkit-version             "1.0.0">
 <!ENTITY lxsession-version            "0.5.4">
 <!ENTITY lxde-common-version          "0.99.2">
Index: x/dm/lxdm.xml
===================================================================
--- x/dm/lxdm.xml	(revision 7991b1f8b85837e00e84f2b9a017f5fb3b08c24b)
+++ x/dm/lxdm.xml	(revision f677c498aeb5a0df17b0a1891d6c151287736ec6)
@@ -86,5 +86,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-     <xref linkend="lxpolkit"/> or
+     <xref linkend="lxsession"/> (for <application>lxpolkit</application>) or
      <xref linkend="polkit-gnome"/>
     </para>
