Index: general.ent
===================================================================
--- general.ent	(revision 72f4fdae82762581e3093c7d77898f8452840090)
+++ general.ent	(revision 1e71a3ac067c87d7a364b0b96dc33301ede5bd31)
@@ -110,5 +110,5 @@
 <!ENTITY libidl-version               "0.8.8">
 <!ENTITY libcroco-version             "0.6.1">
-<!ENTITY libgsf-version               "1.14.5">
+<!ENTITY libgsf-version               "1.14.7">
 <!ENTITY libglade-version             "2.6.1">
 <!ENTITY expat-version                "2.0.1">
@@ -437,5 +437,5 @@
 <!ENTITY libxklavier-version          "3.2">
 <!ENTITY freeglut-version             "2.4.0">
-<!ENTITY goffice-version              "0.4.2">
+<!ENTITY goffice-version              "0.6.1">
 
 <!-- Chapter 27 -->
@@ -580,5 +580,5 @@
 <!-- Chapter 34 -->
 <!ENTITY AbiWord-version              "2.4.6">
-<!ENTITY gnumeric-version             "1.6.3">
+<!ENTITY gnumeric-version             "1.8.1">
 <!ENTITY gnucash-version              "2.2.0">
 <!ENTITY gimp-version                 "2.2.17">
Index: general/genlib/libgsf.xml
===================================================================
--- general/genlib/libgsf.xml	(revision 72f4fdae82762581e3093c7d77898f8452840090)
+++ general/genlib/libgsf.xml	(revision 1e71a3ac067c87d7a364b0b96dc33301ede5bd31)
@@ -7,8 +7,8 @@
   <!ENTITY libgsf-download-http "&gnome-download-http;/libgsf/1.14/libgsf-&libgsf-version;.tar.bz2">
   <!ENTITY libgsf-download-ftp  "&gnome-download-ftp;/libgsf/1.14/libgsf-&libgsf-version;.tar.bz2">
-  <!ENTITY libgsf-md5sum        "0c1a70ca77aef5706544c1b4082a632a">
-  <!ENTITY libgsf-size          "541 KB">
-  <!ENTITY libgsf-buildsize     "16 MB">
-  <!ENTITY libgsf-time          "0.3 SBU">
+  <!ENTITY libgsf-md5sum        "6612f1e57d3974d609bedd2fd8ff6317">
+  <!ENTITY libgsf-size          "580 KB">
+  <!ENTITY libgsf-buildsize     "14 MB">
+  <!ENTITY libgsf-time          "0.2 SBU">
 ]>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 72f4fdae82762581e3093c7d77898f8452840090)
+++ introduction/welcome/changelog.xml	(revision 1e71a3ac067c87d7a364b0b96dc33301ede5bd31)
@@ -45,4 +45,9 @@
       <para>March 9th, 2008</para>
       <itemizedlist>
+        <listitem>
+          <para>[ken] - Updated to gnumeric-1.8.1, with goffice-0.6.1,
+	  libgsf-1.14.7, and warning that gnucash-2.2.0 needs an older
+	  version of goffice.</para>
+        </listitem>
         <listitem>
           <para>[dj] - Updated to gamin-0.1.9.</para>
Index: x/lib/goffice.xml
===================================================================
--- x/lib/goffice.xml	(revision 72f4fdae82762581e3093c7d77898f8452840090)
+++ x/lib/goffice.xml	(revision 1e71a3ac067c87d7a364b0b96dc33301ede5bd31)
@@ -7,7 +7,7 @@
   <!ENTITY goffice-download-http "&gnome-download-http;/goffice/0.4/goffice-&goffice-version;.tar.bz2">
   <!ENTITY goffice-download-ftp  "&gnome-download-ftp;/goffice/0.4/goffice-&goffice-version;.tar.bz2">
-  <!ENTITY goffice-md5sum        "eb72fe8caf7cb4e526671323f6bd4819">
-  <!ENTITY goffice-size          "1.7 MB">
-  <!ENTITY goffice-buildsize     "52 MB">
+  <!ENTITY goffice-md5sum        "a8aa21d089a0ae6f62cb2a9bb70e83db">
+  <!ENTITY goffice-size          "3.0 MB">
+  <!ENTITY goffice-buildsize     "53 MB">
   <!ENTITY goffice-time          "1.0 SBU">
 ]>
@@ -61,4 +61,12 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required Patch: <ulink
+        url="&patch-root;/goffice-&goffice-version;-gtkdoc_rebase-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">GOffice Dependencies</bridgehead>
 
@@ -98,4 +106,6 @@
     commands:</para>
 
+<screen><userinput>patch -Np1 -i ../goffice-&goffice-version;-gtkdoc_rebase-1.patch &amp;&amp;
+</userinput></screen>
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
Index: xsoft/office/gnucash.xml
===================================================================
--- xsoft/office/gnucash.xml	(revision 72f4fdae82762581e3093c7d77898f8452840090)
+++ xsoft/office/gnucash.xml	(revision 1e71a3ac067c87d7a364b0b96dc33301ede5bd31)
@@ -77,5 +77,5 @@
     <para role="required"><xref linkend="guile"/>,
     <xref linkend="slib"/>,
-    <xref linkend="goffice"/>, and
+    <xref linkend="goffice"/> (a version &lt;0.5, 0.4.2 is know to work), and
     <xref linkend="gtkhtml"/></para>
 
Index: xsoft/office/gnumeric.xml
===================================================================
--- xsoft/office/gnumeric.xml	(revision 72f4fdae82762581e3093c7d77898f8452840090)
+++ xsoft/office/gnumeric.xml	(revision 1e71a3ac067c87d7a364b0b96dc33301ede5bd31)
@@ -7,8 +7,8 @@
   <!ENTITY gnumeric-download-http "&gnome-download-http;/gnumeric/1.6/gnumeric-&gnumeric-version;.tar.bz2">
   <!ENTITY gnumeric-download-ftp  "&gnome-download-ftp;/gnumeric/1.6/gnumeric-&gnumeric-version;.tar.bz2">
-  <!ENTITY gnumeric-md5sum        "78ffd75ae6abc3bb20dd04407a082a26">
-  <!ENTITY gnumeric-size          "12.0 MB">
-  <!ENTITY gnumeric-buildsize     "187.0 MB">
-  <!ENTITY gnumeric-time          "2.8 SBU (includes creating HTML documentation)">
+  <!ENTITY gnumeric-md5sum        "a80ae52484b07d772297dcde6c0dab47">
+  <!ENTITY gnumeric-size          "14.0 MB">
+  <!ENTITY gnumeric-buildsize     "205.1 MB">
+  <!ENTITY gnumeric-time          "2.6 SBU (includes creating HTML documentation)">
 ]>
 
@@ -59,6 +59,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="libgnomeprintui"/> and
-    <xref linkend="goffice"/> (you must use a version of <ulink
-    url="&gnome-download-http;/goffice/0.2/">GOffice &lt;0.3.0</ulink>)</para>
+    <xref linkend="goffice"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -73,5 +72,7 @@
     <ulink url="http://www.maemo.org/">Hildon</ulink>, and
     <ulink url="http://packages.ubuntu.com/warty/libdevel/libgb-dev">Gnome
-    Basic</ulink> (this package is no longer under active development)</para>
+    Basic</ulink> (this package is no longer under active development),
+    <ulink url="http://www.valgrind.org/">Valgrind</ulink> to run some of the
+    testsuite</para>
 
     <para>* The
@@ -109,18 +110,11 @@
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>This package requires that it is installed before the test suite is
+    run. The commands to run the tests are located a bit later in the
+    instructions.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role='root'><userinput>make install &amp;&amp;
-
-ln -v -s -f /usr/share/gnome/help/gnumeric \
-            /usr/share/gnumeric/&gnumeric-version;/doc &amp;&amp;
-
-if [ $(pkg-config --variable=prefix ORBit-2.0) != "/usr" ]; then
-    mv -v /usr/lib/bonobo/servers/GNOME_Gnumeric.server \
-        $(pkg-config --variable=prefix ORBit-2.0)/lib/bonobo/servers &amp;&amp;
-    rmdir -v /usr/lib/{bonobo/servers,bonobo}
-fi</userinput></screen>
+<screen role='root'><userinput>make install &amp;&amp;</userinput></screen>
 
     <para>If you have <xref linkend="gnome-doc-utils"/> installed you can
@@ -136,7 +130,9 @@
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role='root'><userinput>install -v -m755 -d /usr/share/doc/gnumeric-&gnumeric-version;/figures &amp;&amp;
-install -v -m644    doc/C/figures/* \
+<screen role='root'><userinput>install -v -m755 -d /usr/share/doc/gnumeric-&gnumeric-version;/figures/icons &amp;&amp;
+install -v -m644    doc/C/figures/*.png \
                     /usr/share/doc/gnumeric-&gnumeric-version;/figures &amp;&amp;
+install -v -m644    doc/C/figures/icons/*.png \
+                    /usr/share/doc/gnumeric-&gnumeric-version;/figures/icons &amp;&amp;
 install -v -m644    doc/C/html/* \
                     /usr/share/doc/gnumeric-&gnumeric-version; &amp;&amp;
@@ -165,12 +161,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../xincludes/scrollkeeper-dir.xml"/>
-
-    <para><command>ln -v -s -f ...
-    /usr/share/gnumeric/&gnumeric-version;/doc</command>: There is a bug which
-    prevents the Help files from being properly displayed. The Help system
-    looks for the files in one location, but they are actually installed in
-    another. See
-    <ulink url="http://bugzilla.gnome.org/show_bug.cgi?id=330339"/>. Creating
-    the symbolic link works around this issue.</para>
 
     <para><parameter>--prefix=$(pkg-config
@@ -179,10 +167,13 @@
     in the <application>GNOME Doc Utils</application> installation.</para>
 
-    <para><command>if [ ... != "/usr" ]; then ...; fi</command>:
-    This command is used to move the <application>Gnumeric</application> Bonobo
-    component description file into the <envar>$GNOME_PREFIX</envar> heirarchy
-    and then remove the unneeded directories only if the
-    <application>GNOME</application> installation is in any
-    prefix other than <filename class='directory'>/usr</filename>.</para>
+  </sect2>
+
+  <sect2 role="testing">
+    <title>Testing gnumeric</title>
+
+    <para>If you wish to run the testuite, issue:</para>
+<screen><userinput>make check</userinput></screen>
+    <para>2 of the 7 tests appear to fail because the csv files they use are
+    missing, 2 others fail for unknown reasons.</para>
 
   </sect2>
@@ -197,10 +188,10 @@
 
       <seglistitem>
-        <seg>gnumeric, gnumeric-&gnumeric-version;, and ssconvert</seg>
-        <seg>numerous filters, plugins and <application>GNOME</application>
+        <seg>gnumeric, gnumeric-&gnumeric-version;, ssconvert, and ssindex</seg>
+        <seg>ilibspreadsheet and numerous filters, plugins and <application>GNOME</application>
         components</seg>
         <seg>/usr/lib/gnumeric,
         /usr/share/doc/gnumeric-&gnumeric-version;, and
-        /usr/share/{{,gnome/help/, omf/, pixmaps/}gnumeric,mc}</seg>
+        /usr/share/{,gnome/help/, omf/, pixmaps/}gnumeric</seg>
       </seglistitem>
     </segmentedlist>
@@ -244,4 +235,15 @@
       </varlistentry>
 
+      <varlistentry id="ssindex">
+        <term><command>ssindex</command></term>
+        <listitem>
+          <para>is a command line utility to generate index data for
+          spreadsheet files.</para>
+          <indexterm zone="gnumeric ssindex">
+            <primary sortas="b-ssindex">ssindex</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
