Index: lxde/apps/apps.xml
===================================================================
--- lxde/apps/apps.xml	(revision 67bd7d46eea5738add8ee7ada0587f12ba19c961)
+++ lxde/apps/apps.xml	(revision 67e58a54d3b9514e3b47af70e9f6a4790a08bcd4)
@@ -25,5 +25,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxinput.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxrandr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxshortcut.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxtask.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxterminal.xml"/>
Index: lxde/apps/lxshortcut.xml
===================================================================
--- lxde/apps/lxshortcut.xml	(revision 67bd7d46eea5738add8ee7ada0587f12ba19c961)
+++ 	(revision )
@@ -1,151 +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 lxshortcut-download-http "&sourceforge-repo;/lxde/lxshortcut-&lxshortcut-version;.tar.gz">
-  <!ENTITY lxshortcut-download-ftp  " ">
-  <!ENTITY lxshortcut-md5sum        "72f0dfafa8098be853beae6e33b5e13b">
-  <!ENTITY lxshortcut-size          "220 KB">
-  <!ENTITY lxshortcut-buildsize     "2.6 MB">
-  <!ENTITY lxshortcut-time          "0.1 SBU">
-]>
-
-<sect1 id="lxshortcut" xreflabel="LXShortcut-&lxshortcut-version;">
-  <?dbhtml filename="lxshortcut.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>LXShortcut-&lxshortcut-version;</title>
-
-  <indexterm zone="lxshortcut">
-    <primary sortas="a-LXShortcut">LXShortcut</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LXShortcut</title>
-
-    <para>
-      The <application>LXShortcut</application> package contains a small
-      program used to edit application shortcuts created with
-      freedesktop.org Desktop Entry spec.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxshortcut-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxshortcut-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxshortcut-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxshortcut-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxshortcut-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxshortcut-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LXShortcut Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxshortcut"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LXShortcut</title>
-
-    <para>
-      Install <application>LXShortcut</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxshortcut
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/lxshortcut
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxshortcut-prog">
-        <term><command>lxshortcut</command></term>
-        <listitem>
-          <para>
-            is a small program used to edit application shortcuts.
-          </para>
-          <indexterm zone="lxshortcut lxshortcut-prog">
-            <primary sortas="b-lxshortcut">lxshortcut</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lxde/desktop/libfm.xml
===================================================================
--- lxde/desktop/libfm.xml	(revision 67bd7d46eea5738add8ee7ada0587f12ba19c961)
+++ lxde/desktop/libfm.xml	(revision 67e58a54d3b9514e3b47af70e9f6a4790a08bcd4)
@@ -7,10 +7,8 @@
   <!ENTITY libfm-download-http "&sourceforge-repo;/pcmanfm/libfm-&libfm-version;.tar.xz">
   <!ENTITY libfm-download-ftp  " ">
-  <!ENTITY libfm-md5sum        "fd3ff9174e097ab3fd619e4a10fd822a">
-  <!ENTITY libfm-size          "684 KB">
-  <!ENTITY libfm-buildsize     "23 MB (additional 5 MB to rebuild and install
-                                the API documentation)">
-  <!ENTITY libfm-time          "0.2 SBU (additional 0.1 SBU to rebuild and
-                                install the API documentation)">
+  <!ENTITY libfm-md5sum        "07d1361bc008db46b0fd4c775f5696de">
+  <!ENTITY libfm-size          "872 KB">
+  <!ENTITY libfm-buildsize     "31 MB (additional 5 MB to rebuild and install the API documentation)">
+  <!ENTITY libfm-time          "0.3 SBU (additional 0.1 SBU to rebuild and install the API documentation)">
 ]>
 
@@ -147,12 +145,14 @@
       <seglistitem>
         <seg>
-          libfm-pref-apps
+          libfm-pref-apps and lxshortcut
         </seg>
         <seg>
-          libfm.so and libfm-gtk.so
+          libfm.so, libfm-extra.so and libfm-gtk.so
+          and several under /usr/lib/libfm/modules/
         </seg>
         <seg>
           /etc/xdg/libfm,
           /usr/include/libfm-1.0,
+          /usr/lib/libfm,
           /usr/share/gtk-doc/html/libfm and
           /usr/share/libfm
@@ -179,4 +179,16 @@
       </varlistentry>
 
+      <varlistentry id="libfm-lxshortcut">
+        <term><command>lxshortcut</command></term>
+        <listitem>
+          <para>
+            is a small program used to edit application shortcuts.
+          </para>
+          <indexterm zone="libfm-lxshortcut">
+            <primary sortas="a-lxshortcut">lxshortcut</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libfm-lib">
         <term><filename class="libraryfile">libfm.so</filename></term>
Index: lxde/desktop/pcmanfm.xml
===================================================================
--- lxde/desktop/pcmanfm.xml	(revision 67bd7d46eea5738add8ee7ada0587f12ba19c961)
+++ lxde/desktop/pcmanfm.xml	(revision 67e58a54d3b9514e3b47af70e9f6a4790a08bcd4)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY pcmanfm-download-http "&sourceforge-repo;/pcmanfm/pcmanfm-&pcmanfm-version;.tar.gz">
+  <!ENTITY pcmanfm-download-http "&sourceforge-repo;/pcmanfm/pcmanfm-&pcmanfm-version;.tar.xz">
   <!ENTITY pcmanfm-download-ftp  " ">
-  <!ENTITY pcmanfm-md5sum        "41104699e653ff2b0a9a9e80a257d6a2">
-  <!ENTITY pcmanfm-size          "428 KB">
-  <!ENTITY pcmanfm-buildsize     "7.8 MB">
+  <!ENTITY pcmanfm-md5sum        "11d59a492c9802866279a6e7e2b3f49e">
+  <!ENTITY pcmanfm-size          "392 KB">
+  <!ENTITY pcmanfm-buildsize     "7.7 MB">
   <!ENTITY pcmanfm-time          "0.1 SBU">
 ]>
