diff --git a/.cvsignore b/.cvsignore
index 9b381f6..3cb95a3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
-gnucash-1.8.1.tar.gz
-gnucash-docs-1.8.0.tar.gz
-libofx-0.6.2.tar.gz
-openhbci-0.9.5.tar.bz2
+gnucash-1.8.7.tar.gz
+gnucash-docs-1.8.3.tar.gz
+libofx-0.6.4.tar.gz
+openhbci-0.9.13.tar.gz
diff --git a/gnucash.spec b/gnucash.spec
index fc25f8e..aed850e 100644
--- a/gnucash.spec
+++ b/gnucash.spec
@@ -1,26 +1,25 @@
-%define docver 1.8.0
-%define hbciver 0.9.5
-%define ofxver 0.6.2
+%define docver 1.8.3
+%define hbciver 0.9.13
+%define ofxver 0.6.4
 
 Name: gnucash
 Summary: GnuCash is an application to keep track of your finances.
-Version: 1.8.1
-Release: 3
+Version: 1.8.7
+Release: 1
 License: GPL/LGPL/GFDL
 Group: Applications/Productivity
 Source: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-%{version}.tar.gz
 Source1: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-docs-%{docver}.tar.gz
 Source2: http://prdownloads.sourceforge.net/libofx/libofx-%{ofxver}.tar.gz
-Source3: http://prdownloads.sourceforge.net/openhbci/openhbci-%{hbciver}.tar.bz2
+Source3: http://prdownloads.sourceforge.net/openhbci/openhbci-%{hbciver}.tar.gz
 Patch2: gnucash-1.6.0-info.patch
-Patch3: gnucash-1.8.1-crash.patch
-Patch10: openhbci-0.9.5-build.patch
+Patch3: gnucash-1.8.5-db.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: g-wrap-devel >= 1.3.2, gtkhtml-devel >= 1.1.4,
 BuildPrereq: Guppi-devel, gal-devel, libxml-devel, db4-devel
 BuildPrereq: libglade-devel, libghttp-devel, python-devel, libtermcap-devel
 BuildPrereq: readline-devel postgresql-devel /usr/bin/autoconf-2.13
-BuildPrereq: openssl-devel, openjade, docbook-style-xsl
+BuildPrereq: openssl-devel, openjade-devel, docbook-style-xsl
 BuildRequires: desktop-file-utils
 Prereq: /sbin/ldconfig, /sbin/install-info, scrollkeeper >= 0.3.4
 %define __perl_requires  %{nil}
@@ -47,8 +46,7 @@ want to keep your financial data in a database instead of a flat file
 %prep
 %setup -q -a 1 -a 2 -a 3
 %patch2 -p1 -b .dir
-%patch3 -p1 -b .crash
-%patch10 -p0
+%patch3 -p0 -b .db
 
 %build
 
@@ -64,7 +62,10 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc
 cd ../openhbci-%{hbciver}
 %configure --with-openssl-libs=%{_libdir}
 make %{?_smp_mflags}
-%makeinstall chroot_dir=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}
+mv  $RPM_BUILD_ROOT/usr/lib/openhbci $RPM_BUILD_ROOT/%{_libdir} || :
+
 perl -pi -e "s|dir=\"/usr\"|dir=\"$RPM_BUILD_ROOT/usr\"|g" \
    $RPM_BUILD_ROOT/usr/bin/openhbci-config
 perl -pi -e 's|$dir/lib|$dir/%{_lib}|g' \
@@ -74,6 +75,7 @@ cd ..
 
 
 autoconf-2.13
+cp %{_datadir}/libtool/config.{sub,guess} .
 export LIBOFX_LIBS=-L$RPM_BUILD_ROOT/%{_libdir}
 export LIBOFX_CFLAGS=-I$RPM_BUILD_ROOT/%{_includedir}
 %configure --enable-sql --enable-error-on-warning=no \
@@ -95,6 +97,7 @@ cd ..
 cd gnucash-docs-%{docver}
 autoconf-2.13
 %configure
+make
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
@@ -161,9 +164,33 @@ fi
 
 %files backend-postgres
 %defattr(-,root,root)
+%doc src/backend/postgres/README
 %{_libdir}/gnucash/libgncmod-backend-postgres*
 
 %changelog
+* Tue Sep 23 2003 Bill Nottingham <notting@redhat.com> 1.8.7-1
+- update to 1.8.7
+- fix docs build
+
+* Wed Aug 20 2003 Bill Nottingham <notting@redhat.com> 1.8.5-1
+- update to 1.8.5
+
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Wed May 28 2003 Bill Nottingham <notting@redhat.com> 1.8.4-1
+- update to 1.8.4
+
+* Mon May 19 2003 Bill Nottingham <notting@redhat.com> 1.8.3-1
+- update to 1.8.3
+
+* Mon Mar 24 2003 Bill Nottingham <notting@redhat.com> 1.8.2-1
+- update to 1.8.2
+
+* Thu Mar 20 2003 Tim Waugh <twaugh@redhat.com> 1.8.1-4
+- Build requires openjade-devel (new openjade sub-package).
+- Rebuild against new OpenSP.
+
 * Mon Feb 24 2003 Elliot Lee <sopwith@redhat.com>
 - debuginfo rebuild
 
diff --git a/sources b/sources
index 9ecf38f..a93a957 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-b7f4601d91c66b00dfa3c76e00c02819  gnucash-1.8.1.tar.gz
-26e245da5e045e5bf4a581fea3a7287d  gnucash-docs-1.8.0.tar.gz
-13f4a0db06903e0829462a9bce180371  libofx-0.6.2.tar.gz
-f39bfe7cb72bff6bf7216fe890baf870  openhbci-0.9.5.tar.bz2
+f2d879195fe179004496230ace60b822  gnucash-1.8.7.tar.gz
+5344138acf9b6a7bf77d0a06511e11e0  gnucash-docs-1.8.3.tar.gz
+4f73e6fe393dedac3961e5145aa95c6c  libofx-0.6.4.tar.gz
+725605239b260ba04c808a9a280d6e85  openhbci-0.9.13.tar.gz