diff --git a/gnucash.spec b/gnucash.spec
index 746a058..b02cf44 100644
--- a/gnucash.spec
+++ b/gnucash.spec
@@ -26,20 +26,18 @@ Source1: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-docs-%{docver
 Patch4: gnucash-1.8.6-64bit-fixes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: g-wrap-devel >= 1.3.2, gtkhtml3-devel
-BuildRequires: libgsf-devel >= 1.12.2, goffice-devel
-# cairo-devel >= 0.5.0
+BuildRequires: libgsf-devel >= 1.12.2, libgsf-gnome-devel, goffice-devel
 BuildRequires: libglade2-devel >= 2.3.6, libgnomeprint22-devel >= 2.8.0
 BuildRequires: libofx-devel, aqbanking-devel, docbook-style-xsl
 BuildRequires: desktop-file-utils, scrollkeeper, texinfo, libtool-ltdl-devel
 BuildRequires: gettext, slib >= 3a1-5, libtool, intltool
 Requires: slib >= 3a1-5, yelp
-# hack
-Requires: perl(Date::Manip)
-Requires: perl(Crypt::SSLeay)
+Requires: perl(Finance::Quote)
+# for HBCI setup wizard
+Requires: qbanking
 Requires(pre): GConf2
 Requires(post): /sbin/ldconfig, scrollkeeper >= 0.3.4, GConf2
 Requires(postun): /sbin/ldconfig, scrollkeeper >= 0.3.4, GConf2
-%define __perl_requires  %{nil}
 Obsoletes: gnucash-backend-postgres
 
 %description
@@ -59,16 +57,18 @@ balanced books.
 %patch4 -p1 -b .64bit
 
 %build
+chmod 644 src/import-export/import-commodity-matcher.c
+
 %if %{buildsvn}
 ./autogen.sh
 %endif
 %configure --disable-sql --enable-error-on-warning=no \
 	--enable-ofx \
 	--enable-hbci \
-	--disable-static \
-#	--with-cairo \
-
-make LIBTOOL=/usr/bin/libtool CC=gcc
+	--disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+make
 
 %if %{buildsvn}
 cd gnucash-docs
@@ -82,7 +82,7 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{name}
 
@@ -131,7 +131,6 @@ fi
 
 export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
 gconftool-2 --makefile-install-rule %{schemas} >/dev/null || :
-done
 
 %preun
 if [ "$1" -eq 0 ]; then
@@ -144,7 +143,7 @@ fi
 /usr/bin/scrollkeeper-update
 
 %files -f %{name}.lang
-%defattr(-,root,root,755)
+%defattr(-,root,root)
 %{_sysconfdir}/gconf/schemas/*
 %dir %{_sysconfdir}/gnucash
 %{_bindir}/*
@@ -164,6 +163,12 @@ fi
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Mon Jan 15 2007 Bill Nottingham <notting@redhat.com> - 2.0.4-4
+- fix perl requirement noise
+- fix libgsf-gnome buildreq
+- fix %%post
+- better rpath fixing
+
 * Thu Jan 11 2007 Bill Nottingham <notting@redhat.com> - 2.0.4-3
 - build against separate goffice
 - various spec cleanups