diff --git a/Makefile.am b/Makefile.am
index 36afac4c15..71fc54241c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,8 +35,7 @@ m4data_DATA = gnucash.m4
 # CVS dirs.
 
 EXTRA_DIST = ChangeLog.1 \
-  HACKING \
-  README.patches \
+  ${doc_DATA} \
   gnucash.lsm \
   gnucash.m4 \
   gnucash-config.in \
diff --git a/configure.in b/configure.in
index 02493ad6a3..b4927f312e 100644
--- a/configure.in
+++ b/configure.in
@@ -2104,7 +2104,6 @@ AC_CONFIG_FILES(po/Makefile.in
           lib/libgsf-1.12.3/gsf-win32/Makefile
           lib/libgsf-1.12.3/tests/Makefile
           lib/libgsf-1.12.3/python/Makefile
-          lib/libgsf-1.12.3/thumbnailer/Makefile
           lib/libgsf-1.12.3/gsf/version.c
           lib/libgsf-1.12.3/libgsf-1.pc
           lib/libgsf-1.12.3/libgsf-1.spec
diff --git a/lib/libqof/qof/Makefile.am b/lib/libqof/qof/Makefile.am
index 45c09268a3..7684251c1f 100644
--- a/lib/libqof/qof/Makefile.am
+++ b/lib/libqof/qof/Makefile.am
@@ -58,6 +58,7 @@ qofinclude_HEADERS = \
    qofobject.h       \
    qofquerycore.h    \
    qofsession.h      \
+   qofsql.h          \
    qofla-dir.h       \
    qof_book_merge.h
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 32922ab41d..2dc06add07 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,4 +43,5 @@ EXTRA_DIST = \
   README.modules \
   gnc-test-env \
   valgrind-gnucash.supp \
-  guile-mappings.h
+  guile-mappings.h \
+  glib-compat.h
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 53caa3df97..d14e241f3b 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -72,7 +72,8 @@ bin_SCRIPTS = ${gnc_common_scripts} update-gnucash-gconf gnucash gnucash-valgrin
 # if you change gncoverridedir, make sure you change ./overrides/Makefile.am too.
 gncoverridesdir = ${GNC_LIBEXECDIR}/overrides
 
-EXTRA_DIST = generate-gnc-script update-gnucash-gconf.in i18n.h.in
+EXTRA_DIST = generate-gnc-script update-gnucash-gconf.in i18n.h.in \
+	gnucash.in gnucash-valgrind.in
 
 ## Gnucash scripts -- real code is in overrides, these just get you there.
 ${gnc_common_scripts}: generate-gnc-script ${top_builddir}/config.status