diff --git a/Makefile.am b/Makefile.am
index 245b5e7f4defd9fb5845b238c7a93146a1a51dfa..52ba595ead513de0d8269289defa7dff584832c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,15 +58,15 @@ distclean-local:
 DISTCLEANFILES = doxygen.log
 
 MAINTAINERCLEANFILES = \
-	configure \
-	Makefile.in \
-	depcomp \
-	config.guess \
-	config.sub \
-	config.h.in \
-	config.h.in~ \
-	compile \
-	ltmain.sh \
-	missing \
-	aclocal.m4 \
-	install-sh
+	$(srcdir)/configure \
+	$(srcdir)/Makefile.in \
+	$(srcdir)/depcomp \
+	$(srcdir)/config.guess \
+	$(srcdir)/config.sub \
+	$(srcdir)/config.h.in \
+	$(srcdir)/config.h.in~ \
+	$(srcdir)/compile \
+	$(srcdir)/ltmain.sh \
+	$(srcdir)/missing \
+	$(srcdir)/aclocal.m4 \
+	$(srcdir)/install-sh
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0b1318a637feb4212e9df8f0f4a3048bb2bbcb8e..ce2d78d9d938a064b2f3ad8bf15efad94f44642c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -11,4 +11,7 @@ dist-hook:
 		cp -p $(srcdir)/manual/$$i/* $(distdir)/manual/$$i/; \
 	done
 
-MAINTAINERCLEANFILES = Makefile.in mdate-sh texinfo.tex
+MAINTAINERCLEANFILES = \
+	$(srcdir)/Makefile.in \
+	$(srcdir)/mdate-sh \
+	$(srcdir)/texinfo.tex
diff --git a/src/Makefile.am b/src/Makefile.am
index c7c9e5ed2c3527910ff94d79f15bcdc1d0a734fa..c9b265d2dd2c4be5615fd97d49a457f2e7eb88e3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -89,4 +89,4 @@ if HTTPD
 libopenocd_la_LIBADD += -lmicrohttpd
 endif
 
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index 2e532a8e33dc298e5462103057750359c2470955..73f02bffc1ac811e9149aa0507bd4e4d2d464419 100644
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -58,4 +58,4 @@ noinst_HEADERS = \
 	pic32mx.h \
 	avrf.h
 
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 15a27c3af27746380698d432b918923d51c5f193..93df6058147ccc47af0e5c2239647cb503b626e1 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -60,4 +60,4 @@ 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
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 9896b8ece4487a6fe3887e54b9b6eb0ddbd3b1e3..cb444b3a1c28c7f57d5626adeba30d34797b1977 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -158,4 +158,4 @@ noinst_HEADERS = \
 	rlink/st7.h \
 	minidummy/jtag_minidriver.h
 
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
diff --git a/src/pld/Makefile.am b/src/pld/Makefile.am
index 24e2c3d9395e40a50e69cdd5bf99bf6c38755c85..06d4fc4d63f3b2deddb63ba8b59286e2584f5d46 100644
--- a/src/pld/Makefile.am
+++ b/src/pld/Makefile.am
@@ -8,4 +8,4 @@ noinst_LTLIBRARIES = libpld.la
 noinst_HEADERS = pld.h xilinx_bit.h virtex2.h
 libpld_la_SOURCES = pld.c xilinx_bit.c virtex2.c
 
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 17e067d2e2e40708f98bb0e61a51d667775e9fdb..2f0700757978aa1defecb142938d017e2c3d666f 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -42,4 +42,4 @@ EXTRA_DIST = \
 	httpd/Stylizer.java \
 	httpd/Stylizer.class
 
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
diff --git a/src/svf/Makefile.am b/src/svf/Makefile.am
index 2709788f8f2b184d4d2b28887bbdcf3e0e6fc542..4dbd57fad44f4839234674219c751d13733536bc 100644
--- a/src/svf/Makefile.am
+++ b/src/svf/Makefile.am
@@ -8,4 +8,4 @@ noinst_LTLIBRARIES = libsvf.la
 noinst_HEADERS = svf.h
 libsvf_la_SOURCES = svf.c
 
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index f28561de1d9568d26acafd989b7d82eb7f315bd1..70b4df783081d273b0888ef2d4ad8b70ff8c5626 100644
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -98,4 +98,4 @@ nobase_dist_pkglib_DATA =
 nobase_dist_pkglib_DATA += xscale/debug_handler.bin 
 nobase_dist_pkglib_DATA += ecos/at91eb40a.elf
 
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
diff --git a/src/xsvf/Makefile.am b/src/xsvf/Makefile.am
index abc6b482b2d64bd0535b0773ddf5c13ef9e9defc..847fb8070037396276e96e75ed8bc9cde46edcb7 100644
--- a/src/xsvf/Makefile.am
+++ b/src/xsvf/Makefile.am
@@ -8,4 +8,4 @@ noinst_LTLIBRARIES = libxsvf.la
 noinst_HEADERS = xsvf.h
 libxsvf_la_SOURCES = xsvf.c
 
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in