diff --git a/build/autoMakefile.am b/build/autoMakefile.am
index e101bef7117a7c4f9bcacd177443d0a5d69aa903..ad51592dba9b4d912bb9a468d1c882bf27a0cccc 100644
--- a/build/autoMakefile.am
+++ b/build/autoMakefile.am
@@ -10,7 +10,7 @@ EXTRA_DIST := Makefile Makefile.in.toplevel		       \
 
 CONFIG_CLEAN_FILES := lustre.spec
 
-MOSTLYCLEANFILES = .*.flags *.o *.ko *.mod.c
+MOSTLYCLEANFILES = .*.flags .*.flags *.o *.ko *.mod.c
 
 distclean: distclean-recursive
 	@true
diff --git a/lnet/klnds/gmlnd/autoMakefile.am b/lnet/klnds/gmlnd/autoMakefile.am
index d8b9edbfa830a45707c4125278983cf77761eb3e..f09d65888b4ab3c9ce9ae08a096e30ce59aeb8e6 100644
--- a/lnet/klnds/gmlnd/autoMakefile.am
+++ b/lnet/klnds/gmlnd/autoMakefile.am
@@ -11,5 +11,5 @@ endif
 endif
 endif
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES = .*.flags *.o *.ko *.mod.c
 DIST_SOURCES = $(kgmnal-objs:%.o=%.c) gmnal.h
diff --git a/lnet/klnds/iiblnd/autoMakefile.am b/lnet/klnds/iiblnd/autoMakefile.am
index 251df660132fcec564de02b32ff8f6efb0132902..e60af1aaf31b91a179f1c521d20cde3d606985c7 100644
--- a/lnet/klnds/iiblnd/autoMakefile.am
+++ b/lnet/klnds/iiblnd/autoMakefile.am
@@ -11,5 +11,5 @@ endif
 endif
 endif
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES = .*.flags *.o *.ko *.mod.c
 DIST_SOURCES = $(kiibnal-objs:%.o=%.c) iibnal.h
diff --git a/lnet/klnds/lolnd/autoMakefile.am b/lnet/klnds/lolnd/autoMakefile.am
index ee6aa98ccb59084513d172e2c7da90b5305123e7..c09dcacd2675d58c0d2ea467a82817619c511a9b 100644
--- a/lnet/klnds/lolnd/autoMakefile.am
+++ b/lnet/klnds/lolnd/autoMakefile.am
@@ -11,5 +11,5 @@ endif
 endif
 endif
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES = .*.flags *.o *.ko *.mod.c
 DIST_SOURCES = $(klonal-objs:%.o=%.c) lonal.h
diff --git a/lnet/klnds/openiblnd/autoMakefile.am b/lnet/klnds/openiblnd/autoMakefile.am
index a4207ae080e6c5c83a95b7053c6393e0ff3243ee..1da49883612c27ccec3c4a9f23396a6f5db0f846 100644
--- a/lnet/klnds/openiblnd/autoMakefile.am
+++ b/lnet/klnds/openiblnd/autoMakefile.am
@@ -11,5 +11,5 @@ endif
 endif
 endif
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES = .*.flags *.o *.ko *.mod.c
 DIST_SOURCES = $(kopenibnal-objs:%.o=%.c) openibnal.h
diff --git a/lnet/klnds/qswlnd/autoMakefile.am b/lnet/klnds/qswlnd/autoMakefile.am
index b5b2e07b3fb08a85ff8639e3ea192e0bca13e7bc..21d717b6c359f62424056bab18a5bbedd0f2bbbe 100644
--- a/lnet/klnds/qswlnd/autoMakefile.am
+++ b/lnet/klnds/qswlnd/autoMakefile.am
@@ -11,5 +11,5 @@ endif
 endif
 endif
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES = .*.flags *.o *.ko *.mod.c
 DIST_SOURCES = $(kqswnal-objs:%.o=%.c) qswnal.h
diff --git a/lnet/klnds/ralnd/autoMakefile.am b/lnet/klnds/ralnd/autoMakefile.am
index f136aa516fbf1672cd017f7cdca4da3284c4a96c..2828d48dd7f4a5295504963c6d797ebd7d9ae762 100644
--- a/lnet/klnds/ralnd/autoMakefile.am
+++ b/lnet/klnds/ralnd/autoMakefile.am
@@ -11,5 +11,5 @@ endif
 endif
 endif
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES = .*.flags *.o *.ko *.mod.c
 DIST_SOURCES = $(kranal-objs:%.o=%.c) ranal.h
diff --git a/lnet/klnds/socklnd/autoMakefile.am b/lnet/klnds/socklnd/autoMakefile.am
index 5fc3fc741fc549cb77c167b0cd08b0355e3bf8d1..c7a1ae4678656adc23ff816713263443448f3ab1 100644
--- a/lnet/klnds/socklnd/autoMakefile.am
+++ b/lnet/klnds/socklnd/autoMakefile.am
@@ -29,4 +29,4 @@ endif # DARWIN
 EXTRA_DIST := $(plist_DATA)
 install-data-hook: $(install_data_hook)
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c socknal_lib.c
+MOSTLYCLEANFILES = .*.flags *.o *.ko *.mod.c socknal_lib.c
diff --git a/lnet/klnds/viblnd/autoMakefile.am b/lnet/klnds/viblnd/autoMakefile.am
index 6d5de4c0e5311340aff5ac37eff66245e4f2cb42..6db28b3185f9b2652b746b9a62783967d0c26aa4 100644
--- a/lnet/klnds/viblnd/autoMakefile.am
+++ b/lnet/klnds/viblnd/autoMakefile.am
@@ -11,5 +11,5 @@ endif
 endif
 endif
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES = .*.flags *.o *.ko *.mod.c
 DIST_SOURCES = $(kvibnal-objs:%.o=%.c) vibnal.h vibnal_wire.h
diff --git a/lnet/lnet/autoMakefile.am b/lnet/lnet/autoMakefile.am
index affce6ee564c8d2649c02674a9e96c669509889f..b8d9aec424198c3a5e6a8c6bda764b0718493690 100644
--- a/lnet/lnet/autoMakefile.am
+++ b/lnet/lnet/autoMakefile.am
@@ -42,5 +42,5 @@ install-data-hook: $(install_data_hook)
 
 EXTRA_DIST := Info.plist
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c portals
+MOSTLYCLEANFILES = .*.flags *.o *.ko *.mod.c portals
 DIST_SOURCES = $(portals-objs:%.o=%.c)
diff --git a/lnet/router/autoMakefile.am b/lnet/router/autoMakefile.am
index 08db5930bae3dd252837f0914a4f73ec5bb3dc4e..699bd808ab7643ce5a31fa4420c46f4b0fa7e788 100644
--- a/lnet/router/autoMakefile.am
+++ b/lnet/router/autoMakefile.am
@@ -13,5 +13,5 @@ endif
 endif
 endif
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES = .*.flags *.o *.ko *.mod.c
 DIST_SOURCES = $(kptlrouter-objs:%.o=%.c) router.h
diff --git a/lnet/tests/autoMakefile.am b/lnet/tests/autoMakefile.am
index 91be8533ffd63dc3978302ec026c91f711ef1f22..426105d7c06e417403adab4d0aca3bf1a64eb876 100644
--- a/lnet/tests/autoMakefile.am
+++ b/lnet/tests/autoMakefile.am
@@ -16,5 +16,5 @@ endif
 endif
 endif
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c pingsrv.c pingcli.c spingsrv.c spingcli.c
+MOSTLYCLEANFILES = .*.flags *.o *.ko *.mod.c pingsrv.c pingcli.c spingsrv.c spingcli.c
 DIST_SOURCES = ping_srv.c ping_cli.c sping_srv.c sping_cli.c ping.h