diff --git a/ChangeLog b/ChangeLog
index 4fd6367f55..c78aa47d61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
 	* src/gnome-utils/dialog-transfer.c: Revert pricedb lookup at
 	warlord's request.
 
+	* src/bin/test/Makefile.am:
+	* src/doc/Makefile.am:
+	* src/import-export/hbci/Makefile.am: 
+	* src/import-export/ofx/Makefile.am: Get 'make distcheck' working again.
+
 2002-12-28  Christian Stimming  <stimming@tuhh.de>
 
 	* src/scm/main.scm: Patch by Peter O'Gorman <peter@pogma.com> for
diff --git a/src/bin/test/Makefile.am b/src/bin/test/Makefile.am
index 0c4ef0118c..3aafe7e972 100644
--- a/src/bin/test/Makefile.am
+++ b/src/bin/test/Makefile.am
@@ -5,18 +5,27 @@ TESTS = test-version test-run-script test-guile-env-override
 # to make sure we're testing in a setup as close to the install
 # arrangement as possible.
 
+GNC_TEST_DEPS := \
+  --guile-load-dir ${top_srcdir}/lib \
+  --guile-load-dir ${top_srcdir}/src/engine \
+  --guile-load-dir ${top_srcdir}/src/scm \
+  --guile-load-dir ${top_srcdir}/src/app-utils \
+  --guile-load-dir ${G_WRAP_MODULE_DIR} \
+  --library-dir    ${G_WRAP_LIB_DIR}
+
 TEST_PWD := $(shell pwd)
 TESTS_ENVIRONMENT := \
   SRCDIR=${srcdir} \
-  PATH="${TEST_PWD}/overrides:${PATH}"
+  PATH="${TEST_PWD}/overrides:${PATH}" \
+  $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
 
 noinst_DATA = overrides.stamp
 
 overrides.stamp:
 	rm -rf overrides
 	mkdir overrides
-	cd overrides && ln -s ${top_srcdir}/src/bin/overrides/gnucash .
-	cd overrides && ln -s ${top_srcdir}/src/bin/overrides/gnucash-run-script .
+	cd overrides && ln -s ../${top_srcdir}/src/bin/overrides/gnucash .
+	cd overrides && ln -s ../${top_srcdir}/src/bin/overrides/gnucash-run-script .
 	cd overrides && ln -s ../../overrides/gnucash-make-guids .
 	cd overrides && ln -s ../../overrides/guile .
 	cd overrides && ln -s ../../overrides/gnucash-build-env gnucash-env
diff --git a/src/doc/Makefile.am b/src/doc/Makefile.am
index 42d766133f..821c6543d6 100644
--- a/src/doc/Makefile.am
+++ b/src/doc/Makefile.am
@@ -11,6 +11,7 @@ EXTRA_DIST = \
   finutil.html \
   plugin.txt \
   tax.txt \
+  doxygen_main_page.c \
   doxygen.cfg.in
 
 docdir = ${GNC_DOC_INSTALL_DIR}
@@ -24,19 +25,14 @@ doc: doxygen.cfg
 #	$(MAKE) -C latex/ 
 #	mv latex/refman.pdf ./refman.pdf
 
-dist-hook: doxygen.cfg
+dist-hook: doc
 	echo "dist-hook: " && pwd
-	cd $(srcdir) && pwd && rm -rf html refman.pdf && $(DOXYGEN) doxygen.cfg
 	cp -rp html ${distdir}
 
 clean-local:
 	echo "clean-local: " && pwd
-	rm -rf latex/
-	rm -f doxygen.log
-
-maintainer-clean-local: clean-local
-	echo "maintainer-clean-local: " && pwd
-	rm -rf html refman.pdf
+	rm -rf html latex
+	rm -f doxygen.cfg doxygen.log refman.pdf
 
 install-data-hook:
 	$(mkinstalldirs) $(DESTDIR)$(docdir)/html
diff --git a/src/import-export/hbci/Makefile.am b/src/import-export/hbci/Makefile.am
index 3eaa046176..e2f0337510 100644
--- a/src/import-export/hbci/Makefile.am
+++ b/src/import-export/hbci/Makefile.am
@@ -18,6 +18,11 @@ libgncmod_hbci_la_SOURCES = \
   hbci-progressmon.c \
   druid-hbci-initial.c 
 
+# Must be included in tarball because they are listed in POTFILES.in
+libgncmod_hbci_la_empty = \
+  druid-hbci-final.c \
+  gnc-hbci-actions.c
+
 noinst_HEADERS = \
   dialog-daterange.h \
   dialog-hbcitrans.h \
@@ -80,6 +85,6 @@ AM_CFLAGS = \
 #gladedir = $(GNC_GLADE_DIR)
 #glade_DATA = 
 
-EXTRA_DIST = ${gncscm_DATA}
+EXTRA_DIST = ${gncscm_DATA} ${libgncmod_hbci_la_empty}
 
 CLEANFILES = hbci import-export gnucash g-wrapped .scm-links
diff --git a/src/import-export/ofx/Makefile.am b/src/import-export/ofx/Makefile.am
index 5beb6a7307..33731ee7dd 100644
--- a/src/import-export/ofx/Makefile.am
+++ b/src/import-export/ofx/Makefile.am
@@ -44,6 +44,7 @@ AM_CFLAGS = \
 
 EXTRA_DIST = \
   .cvsignore \
+  ofx.glade \
   ${gncscm_DATA}
 
 CLEANFILES = ofx import-export gnucash g-wrapped .scm-links