Index: general.ent
===================================================================
--- general.ent	(revision a73d16df998f167d8e37911f952a2bf236b9d364)
+++ general.ent	(revision 2eb3bfa59255bba6d1ef48ef5ed25ef2d4d90506)
@@ -361,5 +361,5 @@
 <!-- Chapter 27 -->
 <!ENTITY sawfish-version              "1.3">
-<!ENTITY fluxbox-version              "0.9.14">
+<!ENTITY fluxbox-version              "0.9.15">
 <!ENTITY metacity-version             "2.12.2">
 <!ENTITY xfce-version                 "4.2.3">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision a73d16df998f167d8e37911f952a2bf236b9d364)
+++ introduction/welcome/changelog.xml	(revision 2eb3bfa59255bba6d1ef48ef5ed25ef2d4d90506)
@@ -54,4 +54,7 @@
           <para>[randy] - Updated to PCRE-6.6.</para>
         </listitem>
+        <listitem>
+          <para>[andy] - Updated Fluxbox to 0.9.15</para>
+        </listitem>
       </itemizedlist>
     </listitem>
Index: x/wm/fluxbox.xml
===================================================================
--- x/wm/fluxbox.xml	(revision a73d16df998f167d8e37911f952a2bf236b9d364)
+++ x/wm/fluxbox.xml	(revision 2eb3bfa59255bba6d1ef48ef5ed25ef2d4d90506)
@@ -6,8 +6,8 @@
 
   <!ENTITY fluxbox-download-http "http://prdownloads.sourceforge.net/fluxbox/fluxbox-&fluxbox-version;.tar.bz2">
-  <!ENTITY fluxbox-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/fluxbox-&fluxbox-version;.tar.bz2">
-  <!ENTITY fluxbox-md5sum        "7641aaea532841e103e9705bb5b98f62">
-  <!ENTITY fluxbox-size          "657 KB">
-  <!ENTITY fluxbox-buildsize     "44.5 MB">
+  <!ENTITY fluxbox-download-ftp  " ">
+  <!ENTITY fluxbox-md5sum        "5fd0353b79d433c117f650a53c254e88">
+  <!ENTITY fluxbox-size          "670 KB">
+  <!ENTITY fluxbox-buildsize     "45.1 MB">
   <!ENTITY fluxbox-time          "0.8 SBU">
 ]>
@@ -170,34 +170,21 @@
       The syntax is explained on the <command>fluxbox</command> man page.</para>
 
-      <para>The themes installed in <filename
-      class='directory'>/usr/share/fluxbox/styles</filename> have not been
-      fixed to call <command>fbsetroot</command>, they still call it by its old
-      name, bsetroot. If you want to change the desktop color with the theme,
-      then fix the styles (as <systemitem class="username">root</systemitem>)
-      with these commands:</para>
-
-<screen><userinput>sed -i 's@ bsetroot@ fbsetroot@' \
-      $(grep -lr bsetroot /usr/share/fluxbox/styles)</userinput></screen>
-
-      <para>However, if you set the desktop color with the themes, it creates a
-      problem when setting a background image. Fluxbox loads the themes after
-      the commands in <filename>~/.fluxbox/startup</filename> have been run,
-      which wipes out the pretty picture it's just set on your desktop!  The
-      solution is to comment out the <command>fbsetroot</command> command in
-      the themes (again, as <systemitem
-      class="username">root</systemitem>):</para>
-
-<screen><userinput>sed -i 's@^ro@! &amp;@' \
-      $(grep -lr bsetroot /usr/share/fluxbox/styles)</userinput></screen>
-
-      <para>You can still set any color you want as your desktop with an
-      <command>fbsetroot</command> command in
-      <filename>~/.fluxbox/startup</filename>.</para>
+      <para>If you want to use an image as your desktop background, copy the
+      theme you like into <filename class='directory'>~/.fluxbox</filename>.
+      Then add a line to make it use the correct image. In the following command,
+      change <replaceable>[theme]</replaceable> for the name of the theme you
+      want and change <replaceable>/path/to/nice/image.xpm</replaceable> to
+      reflect the actual image you want to use.</para>
+
+<screen><userinput>cp /usr/share/fluxbox/styles/[theme] ~/.fluxbox/theme &amp;&amp;
+sed -i 's,\(session.styleFile:\).*,\1 ~/.fluxbox/theme,' \
+ ~/.fluxbox/init &amp;&amp;
+echo "background.pixmap: /path/to/nice/image.xpm" >> ~/.fluxbox/theme
+</userinput></screen>
 
       <para>In some locales the font specified in the theme may not contain the
-      needed characters. This results in menus with blank items.
-      <systemitem class="username">Root</systemitem> can fix this by opening the
-      relevant file in <filename class='directory'>/usr/share/fluxbox/styles</filename>
-      with a text editor and altering it so that it names a font you like.</para>
+      needed characters. This results in menus with blank items. You can fix
+      this by editing <filename>~/.fluxbox/theme</filename> with a text editor
+      and altering it so that it names a suitable font.</para>
 
     </sect3>
