diff --git a/Makefile.am b/Makefile.am
index 5eb5cad2a3b80acf33d5529064cf69623cb70d3e..2f5be6365beb89241eaed851eabe7574a53d6ec8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,3 +11,14 @@ nobase_dist_pkgdata_DATA = \
 	contrib/libdcc/README
 
 SUBDIRS = src doc
+
+MAINTAINERCLEANFILES = \
+	configure \
+	Makefile.in \
+	depcomp \
+	config.guess \
+	config.sub \
+	config.h.in \
+	missing \
+	aclocal.m4 \
+	install-sh
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 71f8a666139385b0b7209f3e1e67a0af64a6b29c..6bc2ea88039950e3bd4680037aefaca5f4ecc6a0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,3 +3,4 @@ openocd_TEXINFOS = fdl.texi
 man_MANS = openocd.1
 EXTRA_DIST = openocd.1
 
+MAINTAINERCLEANFILES = Makefile.in mdate-sh texinfo.tex
diff --git a/src/Makefile.am b/src/Makefile.am
index 24333e31221c50ff92787d3484cec0a81e91bb91..1103e57511088b77baf9b9cb7b12165a98507dbf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -95,3 +95,5 @@ nobase_dist_pkglib_DATA = \
 	tcl/memory.tcl				\
 	tcl/mmr_helpers.tcl			\
 	tcl/readable.tcl
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index 59745541490099625da3d44c6670a6657c2c103a..3d28be81741eb19331fa53efa3f4c7a85d9f53d8 100644
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -8,3 +8,5 @@ libflash_a_SOURCES = flash.c lpc2000.c cfi.c non_cfi.c at91sam7.c at91sam7_old.c
 noinst_HEADERS = flash.h lpc2000.h cfi.h non_cfi.h at91sam7.h at91sam7_old.h str7x.h str9x.h nand.h lpc3180_nand_controller.h \
 				 stellaris.h str9xpec.h stm32x.h tms470.h s3c24xx_nand.h s3c24xx_regs_nand.h lpc288x.h mflash.h \
 				 ocl.h pic32mx.h
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index a7ca723fce7e3e4d5b0f28a8c37d6cfc663861fb..0cfdf7c311a7af2307525b9b8a3401001e431b83 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -32,3 +32,5 @@ startup_tcl.c: startup.tcl bin2char$(EXEEXT_FOR_BUILD)
 
 # add startup_tcl.c to make clean list
 CLEANFILES = startup_tcl.c bin2char$(EXEEXT_FOR_BUILD)
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 55f7e6a2b16e8f30314561670cc02ffd5adb9219..211cedce9e5f8711e82c0c9f88faf7a2bf0e5e35 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -106,3 +106,5 @@ libjtag_a_SOURCES = jtag.c $(BITBANGFILES) $(PARPORTFILES) $(DUMMYFILES) $(FT223
 	$(AT91RM9200FILES) $(GW16012FILES) $(BITQFILES) $(PRESTOFILES) $(USBPROGFILES) $(ECOSBOARDFILES) $(JLINKFILES) $(RLINKFILES) $(VSLLINKFILES)
 
 noinst_HEADERS = bitbang.h jtag.h bitq.h rlink/dtc_cmd.h rlink/ep1_cmd.h rlink/rlink.h rlink/st7.h
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/pld/Makefile.am b/src/pld/Makefile.am
index e3386257d4f182de665865d1ab48999bc2e532ef..a6584e80a56a557ead1abff144c4562af2f2d27e 100644
--- a/src/pld/Makefile.am
+++ b/src/pld/Makefile.am
@@ -3,3 +3,5 @@ METASOURCES = AUTO
 noinst_LIBRARIES = libpld.a
 noinst_HEADERS = pld.h xilinx_bit.h virtex2.h
 libpld_a_SOURCES = pld.c xilinx_bit.c virtex2.c
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 1c0816f06dff983a7bf1a7b13555270cd6ae06ed..075e9560efb400b8359b061bf37a999825680926 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -17,3 +17,5 @@ if HTTPD
 nobase_dist_pkglib_DATA = $(wildcard $(srcdir)/httpd/*.tcl $(srcdir)/httpd/*.css $(srcdir)/httpd/menu_cuts/*.png)
 endif
 AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/svf/Makefile.am b/src/svf/Makefile.am
index fa789d66097824db7be7e1d2089f413e43ac5c0c..47ab0f2e64a0084a77d2f30bcfdcb7a15d25d202 100644
--- a/src/svf/Makefile.am
+++ b/src/svf/Makefile.am
@@ -3,3 +3,5 @@ METASOURCES = AUTO
 noinst_LIBRARIES = libsvf.a
 noinst_HEADERS = svf.h
 libsvf_a_SOURCES = svf.c
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index fd55a04b46b5cb49d2274eaa17985940d093ffaa..cf6982d499b88b85abce93c0ea08f219a4b3bbbc 100644
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -28,3 +28,5 @@ nobase_dist_pkglib_DATA += $(wildcard $(srcdir)/target/*.cfg)
 nobase_dist_pkglib_DATA += $(wildcard $(srcdir)/interface/*.cfg)
 # Various preconfigured boards
 nobase_dist_pkglib_DATA += $(wildcard $(srcdir)/board/*.cfg)
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/xsvf/Makefile.am b/src/xsvf/Makefile.am
index bd1b8fa1c4719196535cf94e3eb7ec5222e30a10..3ad3ca39b4c19457fa2e8cd18dab4213263b0cf3 100644
--- a/src/xsvf/Makefile.am
+++ b/src/xsvf/Makefile.am
@@ -3,3 +3,5 @@ METASOURCES = AUTO
 noinst_LIBRARIES = libxsvf.a
 noinst_HEADERS = xsvf.h
 libxsvf_a_SOURCES = xsvf.c
+
+MAINTAINERCLEANFILES = Makefile.in