Index: x/wm/icewm.xml
===================================================================
--- x/wm/icewm.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
+++ x/wm/icewm.xml	(revision 9a3e4baa5e8d645f96924df05d71ae7dc0301b58)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY icewm-download-http "&sourceforge-repo;/icewm/icewm-&icewm-version;.tar.gz">
+  <!ENTITY icewm-download-http "https://github.com/bbidulock/icewm/releases/download/&icewm-version;/icewm-&icewm-version;.tar.bz2">
   <!ENTITY icewm-download-ftp  " ">
 <!--
   <!ENTITY icewm-download-ftp  "&gentoo-ftp-repo;/icewm-&icewm-version;.tar.gz">
 -->
-  <!ENTITY icewm-md5sum        "6d61aced3bd20b9e7caeb7e8380368c8">
-  <!ENTITY icewm-size          "888 KB">
-  <!ENTITY icewm-buildsize     "33 MB">
-  <!ENTITY icewm-time          "0.3 SBU">
+  <!ENTITY icewm-md5sum        "3e3b8904d53998c0f46414722d86457c">
+  <!ENTITY icewm-size          "1.2 MB">
+  <!ENTITY icewm-buildsize     "58 MB">
+  <!ENTITY icewm-time          "0.6 SBU">
 ]>
 
@@ -68,4 +68,10 @@
     </para>
 
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="libsndfile"/> and
+      <xref linkend="alsa-lib"/> (for the experimental icesound program)
+    </para>
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/icewm"/></para>
@@ -76,15 +82,11 @@
     <title>Installation of IceWM</title>
 
-    <note>
-      <para>This version of <application>IceWM</application> is nominally a
-      development release, but it provides a stable working environment and can
-      be built without using obsolete libraries.</para>
-    </note>
-
     <para>Install <application>IceWM</application> by running the following
     commands:</para>
 
-<screen><userinput>sed -i '/^LIBS/s/\(.*\)/\1 -lfontconfig/' src/Makefile.in &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
+<screen><userinput>
+./configure --prefix=/usr                     \
+            --sysconfdir=/etc                 \
+            --docdir=/usr/share/icewm-&icewm-version; &amp;&amp;
 make</userinput></screen>
 
@@ -94,7 +96,5 @@
 
 <screen role="root"><userinput>make install         &amp;&amp;
-make install-docs    &amp;&amp;
-make install-man     &amp;&amp;
-make install-desktop</userinput></screen>
+rm /usr/share/xsessions/icewm.desktop</userinput></screen>
 
   </sect2>
@@ -104,7 +104,13 @@
 
     <para>
-      <parameter>sed -i '/^LIBS/s/\(.*\)/\1 -lfontconfig/'
-      src/Makefile.in</parameter>: this fixes the build with recent versions of
-      <application>binutils</application>.
+      <parameter>rm /usr/share/xsessions/icewm.desktop</parameter>: The package
+      ships with both icewm,desktop and icewm-xsession.desktop. The former has
+      apparently been used in the past, but it will hang if used with a modern
+      desktop-manager such as <xref linkend="sddm"/>.
+    </para>
+
+    <para>
+      <option>--enable-guievents --with-icesound=ALSA</option>: these two switches
+      permit <command>icesound</command> to be compiled.
     </para>
 
@@ -125,5 +131,6 @@
         and will be used if you have not copied them to <filename
         class="directory">~/.icewm</filename>.
-      </para>
+       </para>
+
 
       <indexterm zone="icewm icewm-config">
@@ -178,4 +185,8 @@
       changed preferences, but changes to the background only take effect when
       <application>IceWM</application> is started.</para>
+
+      <para>At this point you can <emphasis>either</emphasis> modify the
+      traditional menu files to suit your requirements, <emphasis>or</emphasis>
+      use the newer <command>icewm-menu-fdo</command> described later.</para>
 
       <para>The syntax of the menus is explained in the help files, which you
@@ -217,33 +228,17 @@
       </itemizedlist>
 
-      <para>It is unlikely that these examples meet your desires, but if you
-      wish to use them run the following commands:</para>
-
-<screen role="nodump"><userinput>cat &gt; ~/.icewm/menu &lt;&lt; "EOF" &amp;&amp;
-<literal>prog Urxvt xterm urxvt
-prog GVolWheel /usr/share/pixmaps/gvolwheel/audio-volume-medium gvolwheel
-separator
-menufile General folder general
-menufile Multimedia folder multimedia
-menufile Tool_bar folder toolbar</literal>
-EOF
-cat &gt; ~/.icewm/general &lt;&lt; "EOF" &amp;&amp;
-<literal>prog Firefox firefox firefox
-prog Epiphany /usr/share/icons/gnome/16x16/apps/web-browser epiphany
-prog Midori /usr/share/icons/hicolor/24x24/apps/midori midori
-separator
-prog Gimp /usr/share/icons/hicolor/16x16/apps/gimp gimp
-separator
-prog Evince /usr/share/icons/hicolor/16x16/apps/evince evince
-prog Epdfview /usr/share/epdfview/pixmaps/icon_epdfview-48 epdfview</literal>
-EOF
-cat &gt; ~/.icewm/multimedia &lt;&lt; "EOF"
-<literal>prog Audacious /usr/share/icons/hicolor/48x48/apps/audacious audacious
-separator
-prog Parole /usr/share/icons/hicolor/16x16/apps/parole parole
-prog Totem /usr/share/icons/hicolor/16x16/apps/totem totem
-prog Vlc /usr/share/icons/hicolor/16x16/apps/vlc vlc
-prog Xine /usr/share/pixmaps/xine xine</literal>
-EOF</userinput></screen>
+      <para>If you wish to use this traditional method, there are more examples in
+        previous releases of this book (e.g. BLFS-7.8).
+      </para>
+
+      <para><emphasis>Alternatively</emphasis>, you can create a menu which conforms
+        to the FDO Desktop Menu Specifications, where programs can be found because
+        they have a .desktop file in the XDG_DATA_HOME or XDG_DATA_DIR directories.
+        Unlike most windowmanagers, <application>icewm</application> does not search
+        for programs when the menu is invoked, so if you take this route you will
+        need to rerun the following command after installing or removing programs:
+      </para>
+
+<screen><userinput>icewm-menu-fdo >~/.icewm/menu</userinput></screen>
 
       <para>If you wish to put icons on your desktop, you will need to install
@@ -292,6 +287,6 @@
 
       <seglistitem>
-        <seg>icehelp, icesh, icewm, icewm-session, icewm-set-gnomewm, icewmbg,
-        icewmhint, icewmtray</seg>
+        <seg>icehelp, icesh, icesound, icewm, icewm-menu-fdo, icewm-session,
+        icewm-set-gnomewm, icewmbg, icewmhint, icewmtray</seg>
         <seg>None</seg>
         <seg>/usr/share/doc/icewm-&icewm-version;, /usr/share/icewm and ~/.icewm</seg>
@@ -325,4 +320,14 @@
       </varlistentry>
 
+      <varlistentry id="icesound">
+        <term><command>icesound</command></term>
+        <listitem>
+          <para>plays audio files on GUI events raised by IceWM.</para>
+          <indexterm zone="icewm icesound">
+            <primary sortas="b-icesound">icesound</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="icewm-prog">
         <term><command>icewm</command></term>
@@ -331,4 +336,16 @@
           <indexterm zone="icewm icewm-prog">
             <primary sortas="b-icewm">icewm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="icewm-menu-fdo">
+        <term><command>icewm-menu-fdo</command></term>
+        <listitem>
+          <para>can create a file in a format suitable for an IceWM menu, which
+          lists those programs currently installed in a layout conforming to the
+          FDO Desktop Menu Specifications.</para>
+          <indexterm zone="icewm icewm-menu-fdo">
+            <primary sortas="b-icewm-menu-fdo">icewm-menu-fdo</primary>
           </indexterm>
         </listitem>
@@ -349,5 +366,5 @@
         <term><command>icewm-set-gnomewm</command></term>
         <listitem>
-          <para>is a script to set the <application>GNOME</application> to
+          <para>is a script to set the <application>GNOME</application>windowmanager to
           <application>icewm</application> using <application>gconftool</application>.
           </para>
