diff --git a/smartmontools/CHANGELOG b/smartmontools/CHANGELOG
index 6903314aef9e1e30407a98768cf15e9d9cb51999..18e6b6f379ec4386c1e6909033b025eb31d49630 100644
--- a/smartmontools/CHANGELOG
+++ b/smartmontools/CHANGELOG
@@ -42,6 +42,9 @@ NOTES FOR FUTURE RELEASES: see TODO file.
 
 <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
 
+  [CF] Makefile.am: 'make maintainer-clean' now removes also files
+       generated by './autogen.sh'.
+
   [CF] Invalidate 'do_release' script, it needs some rework for SVN.
 
   [CF] Update documentation files for SVN.
diff --git a/smartmontools/Makefile.am b/smartmontools/Makefile.am
index edf486f43805252d336bc6d054effbbdc95400af..7d5221cd6d89c928a302c85785379e88d774767c 100644
--- a/smartmontools/Makefile.am
+++ b/smartmontools/Makefile.am
@@ -262,6 +262,19 @@ if SMARTD_SUFFIX
 CLEANFILES += smartd.conf$(smartd_suffix)
 endif
 
+# 'make maintainer-clean' also removes files generated by './autogen.sh'
+MAINTAINERCLEANFILES = \
+        $(srcdir)/Makefile.in \
+        $(srcdir)/aclocal.m4 \
+        $(srcdir)/configure \
+        $(srcdir)/config.guess \
+        $(srcdir)/config.h.in \
+        $(srcdir)/config.sub \
+        $(srcdir)/depcomp \
+        $(srcdir)/install-sh \
+        $(srcdir)/missing \
+        $(srcdir)/mkinstalldirs
+
 utility.o: svnversion.h
 
 if IS_SVN_BUILD
diff --git a/smartmontools/examplescripts/Makefile.am b/smartmontools/examplescripts/Makefile.am
index 2d1d187b5bdc84200ecc891fd125936fe083f590..cc0a33478b930dafb7ca1f36cd8632eb5d19df35 100644
--- a/smartmontools/examplescripts/Makefile.am
+++ b/smartmontools/examplescripts/Makefile.am
@@ -1,4 +1,8 @@
 ## Process this file with automake to produce Makefile.in
+#
+# $Id$
+#
+
 examplesdir=$(exampledir)
 
 examples_DATA = README
@@ -9,3 +13,5 @@ examples_SCRIPTS = Example1     \
                    Example4
 
 EXTRA_DIST = $(examples_SCRIPTS)
+
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in