diff --git a/sigc++/ChangeLog b/sigc++/ChangeLog
index 288e050135..18da6f1ecb 100644
--- a/sigc++/ChangeLog
+++ b/sigc++/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-25  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* Makefile.am (%.h): generate the BUILT_SOURCES in top_srcdir, add
+	BUILT_SOURCES to EXTRA_DIST
+
 2001-04-17  Allan Rae  <rae@lyx.org>
 
 	* libsigc++-1.0.3 and important local changes kept.  Outlining of
diff --git a/sigc++/Makefile.am b/sigc++/Makefile.am
index ce7ee8cab4..ab0104db7e 100644
--- a/sigc++/Makefile.am
+++ b/sigc++/Makefile.am
@@ -11,6 +11,8 @@ BUILT_SOURCES = slot.h object_slot.h func_slot.h class_slot.h \
                 basic_signal.h \
                 convert.h bind.h rettype.h retbind.h
 
+EXTRA_DIST = $(BUILT_SOURCES)
+
 libsigc_la_SOURCES= $(BUILT_SOURCES) \
    object.cc   scope.cc   marshal.cc   slot.cc\
    basic_signal.cc adaptor.cc thread.cc
@@ -29,7 +31,7 @@ noinst_HEADERS = \
 Makefile: $(BUILT_SOURCES)
 
 %.h: $(M4_DIR)/%.h.m4 $(M4_DIR)/template.macros.m4        
-	$(M4) $(M4_INCLUDES) $(DEFINES) $<  > $@
+	$(M4) $(M4_INCLUDES) $(DEFINES) $<  > $(top_srcdir)/$@
 
 all-local: $(noinst_LTLIBRARIES)