diff --git a/Makefile.am b/Makefile.am
index c555a4c..7e44deb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,14 +40,16 @@ EXTRA_DIST      = build-aux/gnulib-cache.m4 petidomo-approve.pl \
                   config/help config/index config/list-config   \
                   config/list-acl
 
-DISTCLEANFILES  = $(BUILT_SOURCES) $(EXTRA_DIST)
+DISTCLEANFILES  = $(BUILT_SOURCES)
 MAINTAINERCLEANFILES =                                          \
   Makefile.in aclocal.m4 compile config.guess config.sub        \
-  configure liblists/Makefile.in     \
-  libmpools/Makefile.in libargv/Makefile.in librfc822/Makefile.in
+  configure ChangeLog GNUmakefile config.h.in maint.mk
 
 maintainer-clean-local:
-	-rm -rf build-aux
+	-rm -rf build-aux libgnu
+
+distclean-local:
+	-rm -rf autom4te.cache
 
 install-exec-local:
 	test -d "$(DESTDIR)$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6530b60..5de5946 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -8,3 +8,10 @@ dist_html_DATA          = petidomo.html petidomo.css
 petidomo.html:	$(srcdir)/petidomo.tex
 	latex $<
 	htlatex $<
+
+CLEANFILES = \
+  petidomo.4ct petidomo.4tc petidomo.aux petidomo.css petidomo.dvi  \
+  petidomo.html petidomo.idv petidomo.lg petidomo.log petidomo.tmp  \
+  petidomo.toc petidomo.xref
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/libargv/Makefile.am b/libargv/Makefile.am
index bbf4c10..d854b3b 100644
--- a/libargv/Makefile.am
+++ b/libargv/Makefile.am
@@ -4,3 +4,5 @@ noinst_LIBRARIES	= libargv.a
 libargv_a_SOURCES	= argv.c
 
 noinst_HEADERS		= argv.h argv_loc.h
+
+MAINTAINERCLEANFILES	= Makefile.in
diff --git a/libconfigfile/Makefile.am b/libconfigfile/Makefile.am
index 1aa3b1e..4ee113f 100644
--- a/libconfigfile/Makefile.am
+++ b/libconfigfile/Makefile.am
@@ -4,3 +4,5 @@ noinst_LIBRARIES	= libconfigfile.a
 libconfigfile_a_SOURCES	= config.c
 
 noinst_HEADERS		= configfile.h
+
+MAINTAINERCLEANFILES	= Makefile.in
diff --git a/liblists/Makefile.am b/liblists/Makefile.am
index 5b5eff0..00caed4 100644
--- a/liblists/Makefile.am
+++ b/liblists/Makefile.am
@@ -4,3 +4,5 @@ noinst_LIBRARIES	= liblists.a
 liblists_a_SOURCES	= lists.c
 
 noinst_HEADERS		= lists.h
+
+MAINTAINERCLEANFILES	= Makefile.in
diff --git a/libmpools/Makefile.am b/libmpools/Makefile.am
index fb22c6a..461ccaa 100644
--- a/libmpools/Makefile.am
+++ b/libmpools/Makefile.am
@@ -4,3 +4,5 @@ noinst_LIBRARIES	= libmpools.a
 libmpools_a_SOURCES	= mpools.c
 
 noinst_HEADERS		= mpools.h
+
+MAINTAINERCLEANFILES	= Makefile.in
diff --git a/librfc822/Makefile.am b/librfc822/Makefile.am
index 2f101a4..71cb6f4 100644
--- a/librfc822/Makefile.am
+++ b/librfc822/Makefile.am
@@ -15,3 +15,4 @@ test_LDADD        = librfc822.a ../libgnu/libgnu.a
 EXTRA_DIST        = testaddresslines parse_address.c
 
 DISTCLEANFILES    = address.c address_scan.c
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/libtext/Makefile.am b/libtext/Makefile.am
index fa9ff96..7144598 100644
--- a/libtext/Makefile.am
+++ b/libtext/Makefile.am
@@ -6,3 +6,5 @@ libtext_a_SOURCES	= \
   easy_sprintf.c transform_text.c wordwrap.c
 
 noinst_HEADERS		= text.h
+
+MAINTAINERCLEANFILES = Makefile.in