diff --git a/.cvsignore b/.cvsignore
index cf55c2e8..24dcda16 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -8,6 +8,7 @@ libtool
 stamp-h1
 Makefile
 Makefile.in
+README.syncevolution
 syncevolution-*.tar.gz
 config.guess
 config.sub
diff --git a/Makefile.am b/Makefile.am
index d2171c2b..83d94c76 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,7 @@
 SUBDIRS = src etc
 
 EXTRA_DIST = HACKING
+MAINTAINERCLEANFILES = Makefile.in config.h.in config.guess config.sub configure depcomp install-sh ltmain.sh missing mkinstalldirs
 DISTCHECK_CONFIGURE_FLAGS = --with-sync4j=@SYNC4J@
 
 # binary distribution
diff --git a/autogen.sh b/autogen.sh
index 9d2dfe1e..779d3b21 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 libtoolize -c
-automake -a -c
 aclocal
 autoheader
+automake -a -c
 autoconf
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 4adaf984..8b8a4b53 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -6,6 +6,7 @@ localhost_copy = localhost_2/spds/syncml/config.txt \
 
 EXTRA_DIST = $(localhost_source)
 CLEANFILES = $(localhost_copy)
+MAINTAINERCLEANFILES = Makefile.in
 nobase_sysconf_DATA = $(localhost_source) $(localhost_copy)
 
 localhost_2/spds/syncml/config.txt : localhost_1/spds/syncml/config.txt
diff --git a/src/Makefile.am b/src/Makefile.am
index f4c180ed..1e88ccc8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,10 +47,11 @@ test_LDFLAGS = `cppunit-config --libs` $(CORE_LDADD)
 SYNC4J_SUBDIR = @SYNC4J_SUBDIR@
 BUILT_SOURCES = $(SYNC4J_SUBDIR)/all libsync4j.la
 CLEANFILES = libsync4j.la .libs/libsync4j.a .libs/libsync4j.la
+MAINTAINERCLEANFILES = Makefile.in
 
-clean distclean mostlyclean distdir : % : $(SYNC4J_SUBDIR)/%
+clean distclean mostlyclean distdir maintainer-clean : % : $(SYNC4J_SUBDIR)/%
 
-$(SYNC4J_SUBDIR)/distclean :
+$(SYNC4J_SUBDIR)/maintainer-clean $(SYNC4J_SUBDIR)/distclean :
 	rm -rf $(SYNC4J_SUBDIR) client-api
 
 $(SYNC4J_SUBDIR)/distdir :