diff --git a/ChangeLog b/ChangeLog
index fa647ec543..c6aa348b6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* src/business/business-core/business-core.scm: 
 	  Fix a typo; forgot one procedure name-change instance.
 
+	* lib/libqof/qof/Makefile.am: keep qofla-dir.h out of the dist
+	* configure.in: look in builddir for qof includes.
+
 2006-02-14  Derek Atkins  <derek@ihtfp.com>
 
 	* src/report/standard-reports/advanced-portfolio.scm:
diff --git a/configure.in b/configure.in
index 390db86f86..da7747ee6e 100644
--- a/configure.in
+++ b/configure.in
@@ -465,7 +465,7 @@ else
 fi
 if test x$QOF_XML_DIR = x; then
 	QOF_LIB_DIR='${libdir}'
-	QOF_CFLAGS='-I${top_srcdir}/lib/libqof/qof'
+	QOF_CFLAGS='-I${top_builddir}/lib/libqof/qof -I${top_srcdir}/lib/libqof/qof'
 	QOF_LIBS='${top_builddir}/lib/libqof/qof/libqof.la'
 	QOF_VERSION="internal"
 	QOF_PREFIX="internal"
diff --git a/lib/libqof/qof/Makefile.am b/lib/libqof/qof/Makefile.am
index 09cd6cfbd4..40ffad7ea7 100644
--- a/lib/libqof/qof/Makefile.am
+++ b/lib/libqof/qof/Makefile.am
@@ -60,9 +60,11 @@ qofinclude_HEADERS = \
    qofquerycore.h    \
    qofsession.h      \
    qofsql.h          \
-   qofla-dir.h       \
    qof_book_merge.h
 
+nodist_qofinclude_HEADERS = \
+   qofla-dir.h     
+
 noinst_HEADERS = \
    gnc-event-p.h \
    md5.h  \
@@ -82,7 +84,7 @@ EXTRA_DIST = \
   qofla-dir.h.in \
   qofmath128.c
 
-qofla-dir.h: qofla-dir.h.in Makefile
+qofla-dir.h: $(srcdir)/qofla-dir.h.in Makefile
 	rm -f $@.tmp
 	sed < $< > $@.tmp \
                 -e 's:@-libdir-@:${QOFLIBdir}:g'