diff --git a/.gitignore b/.gitignore
index e84d3bf..0b859c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/gnucash-2.3.17.tar.bz2
-/gnucash-2.4.0.tar.bz2
+/gnucash-2.4.2.tar.bz2
diff --git a/changeset_r20260.diff b/changeset_r20260.diff
new file mode 100644
index 0000000..6960a5d
--- /dev/null
+++ b/changeset_r20260.diff
@@ -0,0 +1,12 @@
+Index: /gnucash/trunk/src/engine/gncInvoice.c
+===================================================================
+--- /gnucash/trunk/src/engine/gncInvoice.c (revision 20115)
++++ /gnucash/trunk/src/engine/gncInvoice.c (revision 20260)
+@@ -344,4 +344,7 @@
+     invoice->to_charge_amount = from->to_charge_amount;
+     invoice->date_opened = from->date_opened;
++
++    // Oops. Do not forget to copy the pointer to the correct currency here.
++    invoice->currency = from->currency;
+ 
+     // Copy all invoice->entries
diff --git a/gnucash.spec b/gnucash.spec
index ada4fc7..6efb208 100644
--- a/gnucash.spec
+++ b/gnucash.spec
@@ -2,7 +2,7 @@
 
 Name: gnucash
 Summary: Finance management application
-Version: 2.4.0
+Version: 2.4.2
 URL: http://gnucash.org/
 Release: 1%{?dist}
 License: GPLv2+
@@ -17,11 +17,15 @@ BuildRequires: desktop-file-utils, texinfo
 BuildRequires: gettext, slib >= 3a1-5, libtool, intltool
 BuildRequires: python-devel, libdbi-devel
 Patch0: gnucash-quiet.patch
+Patch1: changeset_r20260.diff
+Patch2: testqof.diff
 Requires: gnucash-docs >= 2.2.0
 Requires: slib >= 3a1-5
 Requires: perl(Finance::Quote)
+%if 0%{?fedora} <= 14 && 0%{?rhel} <= 6
 # for HBCI setup wizard
 Requires: qbanking
+%endif
 Requires(pre): GConf2
 Requires(post): /sbin/ldconfig, GConf2
 Requires(preun): GConf2
@@ -38,13 +42,15 @@ balanced books.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p3
+%patch2 -p1
 find src/quotes -name "*.in" -exec sed -i "s|use lib '@-PERLINCL-@';||g" {} \;
 
 %build
 chmod 644 src/import-export/import-commodity-matcher.c
 %configure  --enable-error-on-warning=no \
 	--enable-ofx \
-	--enable-hbci \
+	--enable-aqbanking \
 	--with-html-engine=webkit \
 	--enable-locale-specific-tax \
 	--enable-dbi \
@@ -77,10 +83,13 @@ rm -rf $RPM_BUILD_ROOT/%{_infodir} \
 	$RPM_BUILD_ROOT/%{_datadir}/aclocal \
 	$RPM_BUILD_ROOT/%{_libdir}/lib*.a \
 	$RPM_BUILD_ROOT/%{_libdir}/gnucash/lib*.a \
-	$RPM_BUILD_ROOT/%{_bindir}/gnc-test-env
+	$RPM_BUILD_ROOT/%{_bindir}/gnc-test-env \
+	$RPM_BUILD_ROOT/%{_bindir}/gnc-fq-update
 
 find $RPM_BUILD_ROOT/%{_libdir} -name *.la -exec rm -f {} \;
 
+rm -rf $RPM_BUILD_ROOT/etc/gconf/gconf.xml.defaults
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -128,6 +137,18 @@ fi
 %doc doc/README.german doc/README.francais doc/README.OFX doc/README.HBCI
 
 %changelog
+* Fri Feb 11 2011 Bill Nottingham <notting@redhat.com> - 2.4.2-1
+- update to 2.4.2
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Jan 17 2011 Bill Nottingham <notting@redhat.com> - 2.4.0-3
+- don't ship gnc-fq-update; updates should be handled by normal packaging
+
+* Wed Jan 12 2011 Bill Nottingham <notting@redhat.com> - 2.4.0-2
+- remove 'this is a development version' warning
+
 * Mon Jan  3 2011 Bill Nottingham <notting@redhat.com> - 2.4.0-1
 - update to 2.4.0
 
diff --git a/sources b/sources
index 0d6dbff..55d4d88 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3d396acb05a062adfc85bc9c4f8f0b08  gnucash-2.4.0.tar.bz2
+ff05a8393ed08b7e99acdb69cd342a55  gnucash-2.4.2.tar.bz2
diff --git a/testqof.diff b/testqof.diff
new file mode 100644
index 0000000..d987916
--- /dev/null
+++ b/testqof.diff
@@ -0,0 +1,12 @@
+diff -up gnucash-2.4.2/src/libqof/qof/test/Makefile.in.cow gnucash-2.4.2/src/libqof/qof/test/Makefile.in
+--- gnucash-2.4.2/src/libqof/qof/test/Makefile.in.cow	2011-02-11 16:32:39.183084047 -0500
++++ gnucash-2.4.2/src/libqof/qof/test/Makefile.in	2011-02-11 16:33:38.573084053 -0500
+@@ -369,7 +369,7 @@ test_qof_HEADERSS = \
+ 
+ #The tests might require more libraries, but try to keep them
+ #as independent as possible.
+-test_qof_LDADD = ${top_builddir}/${MODULEPATH}/libgnc-qof.la
++test_qof_LDADD = ${top_builddir}/${MODULEPATH}/libgnc-qof.la ${GLIB_LIBS}
+ test_qof_CFLAGS = \
+ 	${DEFAULT_INCLUDES} \
+ 	-I$(top_srcdir)/${MODULEPATH}/ \