diff --git a/ChangeLog b/ChangeLog
index 027dc67949..47500521d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-02  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* Makefile.am:
+	  include lcov.mak for lcov coverage generation
+	* tools/Makefile.am:
+	  add to CLEANFILES
+
 2006-07-02  Edward Hervey  <edward@fluendo.com>
 
 	* tests/check/elements/.cvsignore:
diff --git a/Makefile.am b/Makefile.am
index 16ff9b4d9a..bef54e0792 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -109,3 +109,5 @@ win32-update:
 	for f in gstversion.h gstenumtypes.c gstenumtypes.h; do \
 		cp $(top_builddir)/gst/$$f win32/common; done
 	$(top_srcdir)/tools/gst-indent win32/common/gstenumtypes.c
+
+include $(top_srcdir)/common/coverage/lcov.mak
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 05d5f480f6..ea26c35a6c 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -106,7 +106,7 @@ GST_OTHER_MAN = \
 
 manpages = $(GST_LOADSAVE_MAN) $(GST_PARSE_MAN) $(GST_OTHER_MAN)
 
-CLEANFILES = $(manpages) $(bin_SCRIPTS)
+CLEANFILES = $(manpages) $(bin_SCRIPTS) *.gcno *.gcda
 man_MANS = $(manpages)
 
 # developer helper tools, not meant for installation