diff --git a/.cvsignore b/.cvsignore
index 25b8c1a..f4e0304 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnucash-2.0.5.tar.bz2
+gnucash-2.2.0.tar.bz2
diff --git a/gnucash.spec b/gnucash.spec
index 1f240c6..d5d86c3 100644
--- a/gnucash.spec
+++ b/gnucash.spec
@@ -2,32 +2,21 @@
 
 Name: gnucash
 Summary: GnuCash is an application to keep track of your finances
-Version: 2.0.5
+Version: 2.2.0
 URL: http://gnucash.org/
-Release: 3.1%{?dist}
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
 Source: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-%{version}.tar.bz2
-Patch1: gnucash-2.0.5-libofx.patch
-Patch4: gnucash-1.8.6-64bit-fixes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: g-wrap-devel >= 1.3.2
-# for gtkhtml3-devel
 BuildRequires: gtkhtml3-devel
+BuildRequires: libgsf-devel >= 1.12.2, goffice-devel, swig
 BuildRequires: libglade2-devel >= 2.3.6, libgnomeprint22-devel >= 2.8.0
-BuildRequires: libofx-devel, aqbanking-devel
+BuildRequires: libofx-devel, aqbanking-devel, guile-devel
 BuildRequires: desktop-file-utils, texinfo
-BuildRequires: gettext, libtool, intltool
-Requires: gnucash-docs >= 2.0
-%if 0%{?rhel} > 4
-BuildRequires: slib >= 3a1-5, libtool-ltdl-devel
+BuildRequires: gettext, slib >= 3a1-5, libtool, intltool
+Requires: gnucash-docs >= 2.2.0
 Requires: slib >= 3a1-5
-%else
-BuildRequires: umb-scheme, libtool
-Requires: umb-scheme
-# http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=203761
-ExcludeArch: x86_64
-%endif
 Requires: perl(Finance::Quote)
 # for HBCI setup wizard
 Requires: qbanking
@@ -46,8 +35,6 @@ balanced books.
 
 %prep
 %setup -q
-%patch1 -p1 -b .libofx
-%patch4 -p1 -b .64bit
 
 %build
 chmod 644 src/import-export/import-commodity-matcher.c
@@ -129,8 +116,16 @@ fi
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
-* Tue Jun 12 2007 Bill Nottingham <notting@redhat.com> - 2.0.5-3.1
-- EPEL packaging tweaks
+* Mon Jul 16 2007 Bill Nottingham <notting@redhat.com> - 2.2.0-1
+- update to 2.2.0
+
+* Mon Jul  2 2007 Bill Nottingham <notting@redhat.com> - 2.1.5-1
+- update to 2.1.5
+
+* Mon Jun 25 2007 Bill Nottingham <notting@redhat.com> - 2.1.4-1
+- update to RC version 2.1.4
+  - switch to using goffice04, and stock gtkhtml3
+  - no more g-wrap or libtool-ltdl - use swig
 
 * Tue Mar 13 2007 Bill Nottingham <notting@redhat.com> - 2.0.5-3
 - require gtkhtml38 include file to pull in the proper gtkhtml version
diff --git a/sources b/sources
index a739072..45fa5a0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-28f9b160fc01c4e597aca4c53d71fafe  gnucash-2.0.5.tar.bz2
+6e8c1602b365d76ec19ef211857d3ece  gnucash-2.2.0.tar.bz2