Index: general.ent
===================================================================
--- general.ent	(revision fb21320dbb3ea45468df0167d6269dd8b283cdb3)
+++ general.ent	(revision e2e42c701eed016b7bb03328beac0d273ad88b2b)
@@ -238,5 +238,5 @@
 <!ENTITY librsvg-version              "2.26.3">
 <!ENTITY aalib-version                "1.4rc5">
-<!ENTITY imlib2-version               "1.4.4">
+<!ENTITY imlib2-version               "1.4.5">
 <!ENTITY libexif-version              "0.6.19">
 <!ENTITY exiv2-version                "0.21">
@@ -581,5 +581,5 @@
 <!-- Chapter 27 -->
 <!ENTITY sawfish-version              "1.6.1">
-<!ENTITY fluxbox-version              "1.1.1">
+<!ENTITY fluxbox-version              "1.3.2">
 <!ENTITY metacity-version             "2.30.1">
 
Index: general/graphlib/giflib.xml
===================================================================
--- general/graphlib/giflib.xml	(revision fb21320dbb3ea45468df0167d6269dd8b283cdb3)
+++ general/graphlib/giflib.xml	(revision e2e42c701eed016b7bb03328beac0d273ad88b2b)
@@ -38,5 +38,5 @@
     purposes as well as cleaning up images.</para>
 
-    &lfs67_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/graphlib/imlib2.xml
===================================================================
--- general/graphlib/imlib2.xml	(revision fb21320dbb3ea45468df0167d6269dd8b283cdb3)
+++ general/graphlib/imlib2.xml	(revision e2e42c701eed016b7bb03328beac0d273ad88b2b)
@@ -7,8 +7,8 @@
   <!ENTITY imlib2-download-http "&sourceforge-repo;/enlightenment/imlib2-&imlib2-version;.tar.bz2">
   <!ENTITY imlib2-download-ftp  " ">
-  <!ENTITY imlib2-md5sum        "b6de51879502e857d5b1f7622267a0300">
-  <!ENTITY imlib2-size          "888 KB">
+  <!ENTITY imlib2-md5sum        "859e5fede51ec819f4314eee11da3ea5">
+  <!ENTITY imlib2-size          "880 KB">
   <!ENTITY imlib2-buildsize     "14 MB">
-  <!ENTITY imlib2-time          "0.4 SBU">
+  <!ENTITY imlib2-time          "0.3 SBU">
 ]>
 
@@ -33,4 +33,6 @@
     loading, saving, rendering and manipulation.</para>
 
+    &lfs70_checked;
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -54,12 +56,4 @@
       </listitem>
     </itemizedlist>
-
-    <!-- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required Patch: <ulink
-          url="&patch-root;/imlib2-&imlib2-version;-CVE-2008-5187.patch"/></para>
-      </listitem>
-    </itemizedlist> -->
 
     <bridgehead renderas="sect3">Imlib2 Dependencies</bridgehead>
Index: gnome/add/gnome-media.xml
===================================================================
--- gnome/add/gnome-media.xml	(revision fb21320dbb3ea45468df0167d6269dd8b283cdb3)
+++ gnome/add/gnome-media.xml	(revision e2e42c701eed016b7bb03328beac0d273ad88b2b)
@@ -60,18 +60,21 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="GConf"/>,
-    <xref linkend="gnome-doc-utils"/>
-    <xref linkend="gstreamer"/>,
-    <xref linkend="gtk2"/>, and
-    <xref linkend="which"/></para>
+    <para role="required">
+      <xref linkend="GConf"/>,
+      <xref linkend="gnome-doc-utils"/>
+      <xref linkend="gstreamer"/>,
+      <xref linkend="gtk2"/>, and
+      <xref linkend="which"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <xref linkend="gst-plugins-base"/> (required to build the sound mixer and
-    recorder),
-    <xref linkend="libcanberra"/>,
-    <xref linkend="libunique"/>,
-    <ulink url="http://pulseaudio.org/">PulseAudio</ulink>, and
-    <xref linkend="rarian"/></para>
+      <xref linkend="gst-plugins-base"/> (required to build the sound mixer and
+         recorder),
+      <xref linkend="libcanberra"/>,
+      <xref linkend="libunique"/>,
+      <xref linkend="pulseaudio"/>, and
+      <xref linkend="rarian"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
Index: gnome/core/gnome-settings-daemon.xml
===================================================================
--- gnome/core/gnome-settings-daemon.xml	(revision fb21320dbb3ea45468df0167d6269dd8b283cdb3)
+++ gnome/core/gnome-settings-daemon.xml	(revision e2e42c701eed016b7bb03328beac0d273ad88b2b)
@@ -65,7 +65,9 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libcanberra"/>, and
-    <xref linkend="libnotify"/>, and
-    <ulink url="http://pulseaudio.org/">PulseAudio</ulink></para>
+    <para role="optional">
+      <xref linkend="libcanberra"/>, and
+      <xref linkend="libnotify"/>, 
+      <xref linkend="pulseaudio"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision fb21320dbb3ea45468df0167d6269dd8b283cdb3)
+++ introduction/welcome/changelog.xml	(revision e2e42c701eed016b7bb03328beac0d273ad88b2b)
@@ -46,4 +46,10 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Updated to fluxbox-1.3.2.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Updated to inlib2-1.4.5.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Updated to sawfish-1.6.1.</para>
         </listitem>
Index: kde/add/kdemultimedia.xml
===================================================================
--- kde/add/kdemultimedia.xml	(revision fb21320dbb3ea45468df0167d6269dd8b283cdb3)
+++ kde/add/kdemultimedia.xml	(revision e2e42c701eed016b7bb03328beac0d273ad88b2b)
@@ -95,15 +95,17 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><!-- <xref linkend="pkgconfig"/>, -->
-    <xref linkend="flac"/>,
-    <xref linkend="speex"/>,
-    <xref linkend="libmad"/>,
-    <xref linkend="alsa"/>,
-    <xref linkend="libvorbis"/>,
-    <ulink url="http://www.mega-nerd.com/libsamplerate/">Secret Rabbit
-    Code</ulink> (a.k.a. libsamplerate),
-    <ulink url="http://pulseaudio.org/">PulseAudio</ulink>,
-    <ulink url="http://jackit.sourceforge.net/">JACK</ulink>, and
-    <xref linkend="ffmpeg"/> (support is experimental)</para>
+     <para role="optional">
+     <!-- <xref linkend="pkgconfig"/>, -->
+     <xref linkend="flac"/>,
+     <xref linkend="speex"/>,
+     <xref linkend="libmad"/>,
+     <xref linkend="alsa"/>,
+     <xref linkend="libvorbis"/>,
+     <xref linkend="pulseaudio"/>,
+     <xref linkend="ffmpeg"/> (support is experimental), 
+      <ulink url="http://www.mega-nerd.com/libsamplerate/">Secret Rabbit
+        Code</ulink> (a.k.a. libsamplerate), and
+      <ulink url="http://jackit.sourceforge.net/">JACK</ulink>
+    </para>
 
     <bridgehead renderas="sect3">Installation of Akode</bridgehead>
Index: kde4/core/phonon.xml
===================================================================
--- kde4/core/phonon.xml	(revision fb21320dbb3ea45468df0167d6269dd8b283cdb3)
+++ kde4/core/phonon.xml	(revision e2e42c701eed016b7bb03328beac0d273ad88b2b)
@@ -84,5 +84,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <ulink url="http://pulseaudio.org/">PulseAudio</ulink>
+      <xref linkend='pulseaudio'/>
     </para>
 
Index: kde4/core/qimageblitz.xml
===================================================================
--- kde4/core/qimageblitz.xml	(revision fb21320dbb3ea45468df0167d6269dd8b283cdb3)
+++ kde4/core/qimageblitz.xml	(revision e2e42c701eed016b7bb03328beac0d273ad88b2b)
@@ -83,5 +83,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <ulink url="http://pulseaudio.org/">PulseAudio</ulink>
+      <xref linkend='pulseaudio'/>
     </para>
 
Index: kde4/core/shrdesktopontologies.xml
===================================================================
--- kde4/core/shrdesktopontologies.xml	(revision fb21320dbb3ea45468df0167d6269dd8b283cdb3)
+++ kde4/core/shrdesktopontologies.xml	(revision e2e42c701eed016b7bb03328beac0d273ad88b2b)
@@ -83,5 +83,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <ulink url="http://pulseaudio.org/">PulseAudio</ulink>
+      <xref linkend='pulseaudio'/>
     </para>
 -->
Index: multimedia/audioutils/audacious.xml
===================================================================
--- multimedia/audioutils/audacious.xml	(revision fb21320dbb3ea45468df0167d6269dd8b283cdb3)
+++ multimedia/audioutils/audacious.xml	(revision e2e42c701eed016b7bb03328beac0d273ad88b2b)
@@ -96,29 +96,31 @@
 
     <bridgehead renderas="sect4">Optional (for Plugins)</bridgehead>
-    <para role="optional"><xref linkend="alsa"/>,
-    <xref linkend="curl"/>,
-    <xref linkend="neon"/> (for online mpg3 and ogg radio),
-    <xref linkend="lame"/>,
-    <xref linkend="flac"/>,
-    <xref linkend="libvorbis"/>,
-    <xref linkend="faad2"/>,
-    <xref linkend="ffmpeg"/>,
-    <xref linkend="sdl"/>,
-    <xref linkend="mpg123"/>,
-    <xref linkend="libnotify"/>,
-    <ulink url="http://adplug.sourceforge.net/">AdPlug</ulink>,
-    <ulink url="http://www.gnu.org/software/libcdio/">libcdio</ulink>,
-    <ulink url="http://sourceforge.net/projects/libmms">libmms</ulink>,
-    <ulink url="http://www.mega-nerd.com/libsndfile/">libsndfile</ulink>,
-    <ulink url="http://jackit.sourceforge.net/">JACK</ulink>,
-    <ulink url="http://pulseaudio.org/">PulseAudio</ulink>,
-    <ulink url="http://roaraudio.keep-cool.org/">libroar</ulink>,
-    <ulink url="http://sourceforge.net/apps/trac/fluidsynth/">FluidSynth</ulink>,
-    <ulink url="http://libmtp.sourceforge.net/">libmtp</ulink>,
-    <ulink url="http://sourceforge.net/projects/libcue/">libcue</ulink>,
-    <ulink url="http://sourceforge.net/projects/bs2b/">The Bauer
-    stereophonic-to-binaural DSP (bs2b) library</ulink>,
-    <ulink url="http://sourceforge.net/projects/libbinio/">libbinio</ulink>
-    and <ulink url="http://www.wavpack.com/">WavPack</ulink>.</para>
+    <para role="optional">
+      <xref linkend="alsa"/>,
+      <xref linkend="curl"/>,
+      <xref linkend="neon"/> (for online mpg3 and ogg radio),
+      <xref linkend="lame"/>,
+      <xref linkend="flac"/>,
+      <xref linkend="libvorbis"/>,
+      <xref linkend="faad2"/>,
+      <xref linkend="ffmpeg"/>,
+      <xref linkend="sdl"/>,
+      <xref linkend="mpg123"/>,
+      <xref linkend="libnotify"/>,
+      <xref linkend='pulseaudio'/>,
+      <ulink url="http://adplug.sourceforge.net/">AdPlug</ulink>,
+      <ulink url="http://www.gnu.org/software/libcdio/">libcdio</ulink>,
+      <ulink url="http://sourceforge.net/projects/libmms">libmms</ulink>,
+      <ulink url="http://www.mega-nerd.com/libsndfile/">libsndfile</ulink>,
+      <ulink url="http://jackit.sourceforge.net/">JACK</ulink>,
+      <ulink url="http://roaraudio.keep-cool.org/">libroar</ulink>,
+      <ulink url="http://sourceforge.net/apps/trac/fluidsynth/">FluidSynth</ulink>,
+      <ulink url="http://libmtp.sourceforge.net/">libmtp</ulink>,
+      <ulink url="http://sourceforge.net/projects/libcue/">libcue</ulink>,
+      <ulink url="http://sourceforge.net/projects/bs2b/">The Bauer
+        stereophonic-to-binaural DSP (bs2b) library</ulink>,
+      <ulink url="http://sourceforge.net/projects/libbinio/">libbinio</ulink>, and
+      <ulink url="http://www.wavpack.com/">WavPack</ulink>.
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
Index: multimedia/audioutils/mpg123.xml
===================================================================
--- multimedia/audioutils/mpg123.xml	(revision fb21320dbb3ea45468df0167d6269dd8b283cdb3)
+++ multimedia/audioutils/mpg123.xml	(revision e2e42c701eed016b7bb03328beac0d273ad88b2b)
@@ -67,8 +67,8 @@
     <xref linkend="arts"/>,
     <xref linkend="esound"/>,
+    <xref linkend='pulseaudio'/>,
     <ulink url="http://jackaudio.org">JACK</ulink>,
 <!--    <xref linkend="nas"/>, -->
     <ulink url="http://www.portaudio.com">PortAudio</ulink>,
-    <ulink url="http://pulseaudio.org">PulseAudio</ulink>,
     <xref linkend="sdl"/></para>
 
Index: multimedia/libdriv/alsa-plugins.xml
===================================================================
--- multimedia/libdriv/alsa-plugins.xml	(revision fb21320dbb3ea45468df0167d6269dd8b283cdb3)
+++ multimedia/libdriv/alsa-plugins.xml	(revision e2e42c701eed016b7bb03328beac0d273ad88b2b)
@@ -70,10 +70,12 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="ffmpeg"/>,
-    <xref linkend="speex"/>,
-    <ulink url="http://jackaudio.org/">JACK</ulink>,
-    <ulink url="http://pulseaudio.org/">PulseAudio</ulink>, and
-    <ulink url="http://www.mega-nerd.com/libsamplerate/">Secret Rabbit
-    Code</ulink> (a.k.a. libsamplerate)</para>
+    <para role="optional">
+      <xref linkend="ffmpeg"/>,
+      <xref linkend="speex"/>,
+      <xref linkend='pulseaudio'/>,
+      <ulink url="http://jackaudio.org/">JACK</ulink>, and
+      <ulink url="http://www.mega-nerd.com/libsamplerate/">Secret Rabbit
+      Code</ulink> (a.k.a. libsamplerate)
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
Index: multimedia/libdriv/libao.xml
===================================================================
--- multimedia/libdriv/libao.xml	(revision fb21320dbb3ea45468df0167d6269dd8b283cdb3)
+++ multimedia/libdriv/libao.xml	(revision e2e42c701eed016b7bb03328beac0d273ad88b2b)
@@ -63,11 +63,11 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="x-window-system"/>,
-    <xref linkend="esound"/>,
-    <xref linkend="alsa"/>,
-    <xref linkend="arts"/>, and
-<!--    <xref linkend="nas"/>, and -->
-    <ulink url="http://pulseaudio.org/">PulseAudio</ulink> (requires <ulink
-    url="http://www.hpl.hp.com/research/linux/atomic_ops/">atomic_ops</ulink>)</para>
+    <para role="optional">
+      <xref linkend="x-window-system"/>,
+      <xref linkend="esound"/>,
+      <xref linkend="alsa"/>,
+      <xref linkend="arts"/>, and
+      <xref linkend='pulseaudio'/> (requires <xref linkend='libatomic_ops'/>)
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
Index: multimedia/libdriv/libcanberra.xml
===================================================================
--- multimedia/libdriv/libcanberra.xml	(revision fb21320dbb3ea45468df0167d6269dd8b283cdb3)
+++ multimedia/libdriv/libcanberra.xml	(revision e2e42c701eed016b7bb03328beac0d273ad88b2b)
@@ -64,10 +64,12 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="alsa-lib"/>,
-    <xref linkend="gstreamer"/>,
-    <xref linkend="gtk2"/>,
-    <ulink url="http://pulseaudio.org/">PulseAudio</ulink>,
-    <ulink url="http://tdb.samba.org/">tdb</ulink>,
-    <xref linkend="xorg7-proto"/></para>
+    <para role="optional">
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="gstreamer"/>,
+      <xref linkend="gtk2"/>,
+      <xref linkend='pulseaudio'/>,
+      <xref linkend="xorg7-proto"/>, and 
+      <ulink url="http://tdb.samba.org/">tdb</ulink>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
Index: multimedia/libdriv/sdl.xml
===================================================================
--- multimedia/libdriv/sdl.xml	(revision fb21320dbb3ea45468df0167d6269dd8b283cdb3)
+++ multimedia/libdriv/sdl.xml	(revision e2e42c701eed016b7bb03328beac0d273ad88b2b)
@@ -59,20 +59,22 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="alsa"/>,
-    <xref linkend="esound"/>,
-    <ulink url="http://pulseaudio.org">PulseAudio</ulink>,
-    <xref linkend="arts"/>,
-<!--    <xref linkend="nas"/>, -->
-    <xref linkend="NASM"/>,
-    <xref linkend="libusb"/>,
-    <xref linkend="x-window-system"/>,
-    <ulink url="http://www.directfb.org/">DirectFB</ulink>,
-    <ulink url="http://www.ggi-project.org/">GGI</ulink>,
-    <ulink url="http://my.arava.co.il/~matan/svgalib/">SVGAlib-1.9.5</ulink>
-    (<ulink url="&patch-root;/svgalib-1.9.25-megafixes-1.patch">patched</ulink>),
-    <xref linkend="aalib"/>,
-    <ulink url="http://caca.zoy.org/wiki/libcaca">libcaca</ulink>,
-    <ulink url="http://picogui.org/">PicoGUI</ulink>, and
-    <xref linkend="pth"/></para>
+    <para role="optional">
+      <xref linkend="alsa"/>,
+      <xref linkend="esound"/>,
+      <xref linkend='pulseaudio'/>
+      <xref linkend="arts"/>,
+      <!--<xref linkend="nas"/>,-->
+      <xref linkend="NASM"/>,
+      <xref linkend="libusb"/>,
+      <xref linkend="x-window-system"/>,
+      <xref linkend="aalib"/>,
+      <xref linkend="pth"/>,
+      <ulink url="http://www.directfb.org/">DirectFB</ulink>,
+      <ulink url="http://www.ggi-project.org/">GGI</ulink>,
+      <ulink url="http://my.arava.co.il/~matan/svgalib/">SVGAlib-1.9.5</ulink>
+      (<ulink url="&patch-root;/svgalib-1.9.25-megafixes-1.patch">patched</ulink>),
+      <ulink url="http://caca.zoy.org/wiki/libcaca">libcaca</ulink>, and
+      <ulink url="http://picogui.org/">PicoGUI</ulink>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
Index: multimedia/libdriv/xine-lib.xml
===================================================================
--- multimedia/libdriv/xine-lib.xml	(revision fb21320dbb3ea45468df0167d6269dd8b283cdb3)
+++ multimedia/libdriv/xine-lib.xml	(revision e2e42c701eed016b7bb03328beac0d273ad88b2b)
@@ -62,9 +62,13 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="x-window-system"/> and at least one of:
-    <xref linkend="alsa"/>, <xref linkend="esound"/>, OSS,
-    <xref linkend="arts"/>,
-    <ulink url="http://pulseaudio.org/">PulseAudio</ulink> or
-    <ulink url="http://jackaudio.org/">JACK</ulink></para>
+    <para role="required">
+      <xref linkend="x-window-system"/> and at least one of:
+        <xref linkend="alsa"/>, 
+        <xref linkend="esound"/>, 
+        OSS,
+        <xref linkend="arts"/>,
+        <xref linkend='pulseaudio'/> or
+        <ulink url="http://jackaudio.org/">JACK</ulink>
+    </para>
 
     <!-- <bridgehead renderas="sect4">Recommended</bridgehead>
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision fb21320dbb3ea45468df0167d6269dd8b283cdb3)
+++ multimedia/videoutils/mplayer.xml	(revision e2e42c701eed016b7bb03328beac0d273ad88b2b)
@@ -176,14 +176,16 @@
 
     <bridgehead renderas="sect4">Optional Audio Output Drivers and Libraries</bridgehead>
-    <para role="optional"><xref linkend="alsa"/>,
-    <xref linkend="arts"/>,
-    <xref linkend="esound"/>,
-    <ulink url="http://jackit.sourceforge.net/">JACK</ulink>,
-    <ulink url="http://www.ladspa.org/">LADSPA</ulink>,
-<!--    <xref linkend="nas"/>, -->
-    <ulink url="http://openal.org/">OpenAL</ulink>,
-    <ulink url="http://pulseaudio.org/">PulseAudio</ulink>, and 
-    <xref linkend="sdl"/> (also used for video output)<!--, and
-    <xref linkend="xmms"/>--></para>
+    <para role="optional">
+      <xref linkend="alsa"/>,
+      <xref linkend="arts"/>,
+      <xref linkend="esound"/>,
+      <xref linkend='pulseaudio'/>,  
+      <xref linkend="sdl"/> (also used for video output),
+      <ulink url="http://jackit.sourceforge.net/">JACK</ulink>,
+      <ulink url="http://www.ladspa.org/">LADSPA</ulink>, and
+      <ulink url="http://openal.org/">OpenAL</ulink>
+      <!--<xref linkend="nas"/>,-->
+      <!--<xref linkend="xmms"/>-->
+    </para>
 
     <bridgehead renderas="sect4">Optional Video Output Drivers and Libraries</bridgehead>
Index: x/lib/qt4.xml
===================================================================
--- x/lib/qt4.xml	(revision fb21320dbb3ea45468df0167d6269dd8b283cdb3)
+++ x/lib/qt4.xml	(revision e2e42c701eed016b7bb03328beac0d273ad88b2b)
@@ -72,8 +72,8 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-<!--      <xref linkend="nas"/>, -->
+      <!--<xref linkend="nas"/>,-->
       <xref linkend="dbus"/>,
       <xref linkend="gst-plugins-base"/>,
-      <ulink url="http://www.pulseaudio.org/">PulseAudio</ulink>,
+      <xref linkend='pulseaudio'/>,
       <xref linkend="glib2"/>,
       <xref linkend="gtk2"/>,
Index: x/wm/fluxbox.xml
===================================================================
--- x/wm/fluxbox.xml	(revision fb21320dbb3ea45468df0167d6269dd8b283cdb3)
+++ x/wm/fluxbox.xml	(revision e2e42c701eed016b7bb03328beac0d273ad88b2b)
@@ -6,9 +6,9 @@
 
   <!ENTITY fluxbox-download-http "&sourceforge-repo;/fluxbox/fluxbox-&fluxbox-version;.tar.bz2">
-  <!ENTITY fluxbox-download-ftp  "&gentoo-ftp-repo;/fluxbox-&fluxbox-version;.tar.bz2">
-  <!ENTITY fluxbox-md5sum        "fa9fa8fe9a44f86522de5754f8b285ca">
-  <!ENTITY fluxbox-size          "760 KB">
-  <!ENTITY fluxbox-buildsize     "62 MB">
-  <!ENTITY fluxbox-time          "1 SBU">
+  <!ENTITY fluxbox-download-ftp  "&gentoo-ftp-repo;/fluxbox-&fluxbox-version;.tar.">
+  <!ENTITY fluxbox-md5sum        "f95b0bdb9ee41bfac124bd0fc601f248">
+  <!ENTITY fluxbox-size          "776 KB">
+  <!ENTITY fluxbox-buildsize     "135 MB">
+  <!ENTITY fluxbox-time          "1.1 SBU">
 ]>
 
@@ -33,5 +33,5 @@
     manager.</para>
 
-    &lfs65_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -180,8 +180,6 @@
 
 <screen><userinput>cp /usr/share/fluxbox/styles/&lt;theme&gt; ~/.fluxbox/theme &amp;&amp;
-sed -i 's,\(session.styleFile:\).*,\1 ~/.fluxbox/theme,' \
- ~/.fluxbox/init &amp;&amp;
-echo "background.pixmap: &lt;/path/to/nice/image.xpm&gt;" >> ~/.fluxbox/theme
-</userinput></screen>
+sed -i 's,\(session.styleFile:\).*,\1 ~/.fluxbox/theme,' ~/.fluxbox/init &amp;&amp;
+echo "background.pixmap: &lt;/path/to/nice/image.xpm&gt;" &gt;&gt; ~/.fluxbox/theme</userinput></screen>
 
       <para>In some locales the font specified in the theme may not contain the
