diff --git a/gnucash-goffice0.8.patch b/gnucash-goffice0.8.patch
new file mode 100644
index 0000000..cc648bb
--- /dev/null
+++ b/gnucash-goffice0.8.patch
@@ -0,0 +1,16 @@
+Index: /gnucash/trunk/configure.in
+===================================================================
+--- /gnucash/trunk/configure.in (revision 17446)
++++ /gnucash/trunk/configure.in (revision 17494)
+@@ -1086,6 +1086,8 @@
+     goffice_with_cairo=0
+     have_goffice_0_5=0
+-    PKG_CHECK_MODULES(GOFFICE, libgoffice-0.6 >= 0.6.0, [goffice=1], [
+-      PKG_CHECK_MODULES(GOFFICE, libgoffice-0.5 >= 0.5.1, [goffice=1], [goffice=0])
++    PKG_CHECK_MODULES(GOFFICE, libgoffice-0.8 >= 0.7.0, [goffice=1], [
++      PKG_CHECK_MODULES(GOFFICE, libgoffice-0.6 >= 0.6.0, [goffice=1], [
++        PKG_CHECK_MODULES(GOFFICE, libgoffice-0.5 >= 0.5.1, [goffice=1], [goffice=0])
++      ])
+     ])
+     if test x$goffice = x1
+
diff --git a/gnucash.changes b/gnucash.changes
index bb22dad..25e609d 100644
--- a/gnucash.changes
+++ b/gnucash.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Oct  3 21:00:08 CEST 2008 - vuntz@novell.com
+
+- Add gnucash-goffice0.8.patch to compile with current goffice in
+  Factory.
+
 -------------------------------------------------------------------
 Wed Apr  2 04:40:56 CEST 2008 - maw@suse.de
 
diff --git a/gnucash.spec b/gnucash.spec
index d1a2fc4..eafa0d3 100644
--- a/gnucash.spec
+++ b/gnucash.spec
@@ -2,9 +2,16 @@
 # spec file for package gnucash (Version 2.2.4)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -13,7 +20,7 @@
 
 Name:           gnucash
 Version:        2.2.4
-Release:        1
+Release:        88
 Url:            http://www.gnucash.org/
 Group:          Productivity/Office/Finance
 License:        GPL v2 or later
@@ -22,6 +29,8 @@ Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}-rpmlintrc
 Patch:          gnucash-desktop.patch
 Patch3:         gnucash-cpan-warning.patch
+# PATCH-FIX-UPSTREAM gnucash-goffice0.8.patch vuntz@novell.com -- Compile with goffice 0.7/0.8
+Patch4:         gnucash-goffice0.8.patch
 Requires:       guile slib
 # Required to make quotes working. Gnucash can run without quotes support:
 Requires:       perl-Crypt-SSLeay perl-DateManip perl-Finance-Quote perl-HTML-Parser perl-HTML-TableExtract perl-libwww-perl
@@ -417,6 +426,7 @@ Authors:
 %patch
 # This patch must be applied:
 %patch3
+%patch4 -p3
 # build fix, G_INLINE_FUNC definition in glib2 is broken again for gcc-4.3
 sed -i "s:^\(GNC_DOC_INSTALL_DIR=\).*$:\1'%{_docdir}/%{name}':" configure.in
 # Potentially conflicts with pkg-config:
@@ -500,6 +510,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/gnucash
 
 %changelog
+* Fri Oct 03 2008 vuntz@novell.com
+- Add gnucash-goffice0.8.patch to compile with current goffice in
+  Factory.
 * Wed Apr 02 2008 maw@suse.de
 - Update to version 2.2.4:
   + Recognize 401k/403b in QIF import