diff --git a/configs/README.txt b/configs/README.txt
index 3bcb62e00ae..fb6c655657d 100644
--- a/configs/README.txt
+++ b/configs/README.txt
@@ -81,7 +81,7 @@ Make.defs -- This makefile fragment provides architecture and
 
 	Tools: CC, LD, AR, NM, OBJCOPY, OBJDUMP
 	Tool options: CFLAGS, LDFLAGS
-	COMPILE, ASSEMBLE, ARCHIVE, and MKDEP macros
+	COMPILE, ASSEMBLE, ARCHIVE, CLEAN, and MKDEP macros
 
   When this makefile fragment runs, it will be passed TOPDIR which
   is the path to the root directory of the build.  This makefile
diff --git a/configs/c5471evm/Make.defs b/configs/c5471evm/Make.defs
index cda4d72082c..bd44f0f7f9f 100644
--- a/configs/c5471evm/Make.defs
+++ b/configs/c5471evm/Make.defs
@@ -84,6 +84,10 @@ define ARCHIVE
 	$(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; }
 endef
 
+define CLEAN
+	@rm -f *.o *.a
+endef
+
 MKDEP			= $(TOPDIR)/tools/mkdeps.sh
 
 HOSTCC			= gcc
diff --git a/configs/c5471evm/src/Makefile b/configs/c5471evm/src/Makefile
index 4b0541ae16c..9a05c016230 100644
--- a/configs/c5471evm/src/Makefile
+++ b/configs/c5471evm/src/Makefile
@@ -68,8 +68,8 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	rm -f libboard$(LIBEXT) *~
-	if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call CLEAN)
 
 distclean: clean
 	rm -f Make.dep .depend
diff --git a/configs/m68332evb/Make.defs b/configs/m68332evb/Make.defs
index af4a880119b..f12369c970a 100644
--- a/configs/m68332evb/Make.defs
+++ b/configs/m68332evb/Make.defs
@@ -84,6 +84,10 @@ define ARCHIVE
 	$(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; }
 endef
 
+define CLEAN
+	@rm -f *.o *.a
+endef
+
 MKDEP			= $(TOPDIR)/tools/mkdeps.sh
 
 HOSTCC			= gcc
diff --git a/configs/m68332evb/src/Makefile b/configs/m68332evb/src/Makefile
index a3c568cec69..0265ec858d3 100644
--- a/configs/m68332evb/src/Makefile
+++ b/configs/m68332evb/src/Makefile
@@ -65,8 +65,8 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	rm -f libboard$(LIBEXT) *~
-	if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call CLEAN)
 
 distclean: clean
 	rm -f Make.dep .depend
diff --git a/configs/mcu123-lpc214x/Make.defs b/configs/mcu123-lpc214x/Make.defs
index 356b6e9c70d..70c1d8cc5e1 100644
--- a/configs/mcu123-lpc214x/Make.defs
+++ b/configs/mcu123-lpc214x/Make.defs
@@ -84,6 +84,10 @@ define ARCHIVE
 	$(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; }
 endef
 
+define CLEAN
+	@rm -f *.o *.a
+endef
+
 MKDEP			= $(TOPDIR)/tools/mkdeps.sh
 
 HOSTCC			= gcc
diff --git a/configs/mcu123-lpc214x/src/Makefile b/configs/mcu123-lpc214x/src/Makefile
index 93dea86be8f..ab06f200223 100644
--- a/configs/mcu123-lpc214x/src/Makefile
+++ b/configs/mcu123-lpc214x/src/Makefile
@@ -68,8 +68,8 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	rm -f libboard$(LIBEXT) *~
-	if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call CLEAN)
 
 distclean: clean
 	rm -f Make.dep .depend
diff --git a/configs/ntosd-dm320/Make.defs b/configs/ntosd-dm320/Make.defs
index 1be65e7b82a..25acc1e41d6 100644
--- a/configs/ntosd-dm320/Make.defs
+++ b/configs/ntosd-dm320/Make.defs
@@ -84,6 +84,10 @@ define ARCHIVE
 	$(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; }
 endef
 
+define CLEAN
+	@rm -f *.o *.a
+endef
+
 MKDEP			= $(TOPDIR)/tools/mkdeps.sh
 
 HOSTCC			= gcc
diff --git a/configs/ntosd-dm320/src/Makefile b/configs/ntosd-dm320/src/Makefile
index de36b3d5cba..45a008c58c4 100644
--- a/configs/ntosd-dm320/src/Makefile
+++ b/configs/ntosd-dm320/src/Makefile
@@ -68,8 +68,8 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	rm -f libboard$(LIBEXT) *~
-	if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call CLEAN)
 
 distclean: clean
 	rm -f Make.dep .depend
diff --git a/configs/pjrc-8051/Make.defs b/configs/pjrc-8051/Make.defs
index 5c2482e37e7..5c77c6f22a7 100644
--- a/configs/pjrc-8051/Make.defs
+++ b/configs/pjrc-8051/Make.defs
@@ -77,6 +77,10 @@ define ARCHIVE
 	$(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; }
 endef
 
+define CLEAN
+	@rm -f *.asm *.rel *.lst *.rst *.sym *.adb *.lnk *.map *.mem *.ihx *.hex
+endef
+
 MKDEP			= $(TOPDIR)/tools/mkdeps.sh
 
 HOSTCC			= gcc
diff --git a/configs/pjrc-8051/src/Makefile b/configs/pjrc-8051/src/Makefile
index 31066a6372f..0d6a7f05a27 100644
--- a/configs/pjrc-8051/src/Makefile
+++ b/configs/pjrc-8051/src/Makefile
@@ -67,9 +67,8 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	rm -f libboard$(LIBEXT)
-	rm -f *.asm *.rel *.lst *.rst *.sym *.adb *.lnk *.map *.mem *.ihx *.hex *~
-	if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call CLEAN)
 
 distclean: clean
 	rm -f Make.dep .depend
diff --git a/configs/sim/Make.defs b/configs/sim/Make.defs
index 528d8cf53e3..28069e16a36 100644
--- a/configs/sim/Make.defs
+++ b/configs/sim/Make.defs
@@ -83,6 +83,10 @@ define ARCHIVE
 	$(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; }
 endef
 
+define CLEAN
+	@rm -f *.o *.a
+endef
+
 MKDEP			= $(TOPDIR)/tools/mkdeps.sh
 
 HOSTCC			= gcc
diff --git a/configs/sim/src/Makefile b/configs/sim/src/Makefile
index 55f6860917d..076b917c5de 100644
--- a/configs/sim/src/Makefile
+++ b/configs/sim/src/Makefile
@@ -65,8 +65,8 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	rm -f libboard$(LIBEXT) *~
-	if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call CLEAN)
 
 distclean: clean
 	rm -f Make.dep .depend
diff --git a/configs/z16f2800100zcog/Make.defs b/configs/z16f2800100zcog/Make.defs
index 7e1984384f6..8c5b7edfd8f 100644
--- a/configs/z16f2800100zcog/Make.defs
+++ b/configs/z16f2800100zcog/Make.defs
@@ -131,6 +131,10 @@ define ARCHIVE
 	$(AR) $(ARFLAGS) $1=-+$2 || { echo "$(AR) $1=-+$2 FAILED!" ; exit 1 ; }
 endef
 
+define CLEAN
+	@rm -f *.obj *.src *.lib *.hex
+endef
+
 # This is the tool to use for dependencies (i.e., none)
 
 MKDEP			= $(TOPDIR)/tools/mknulldeps.sh
diff --git a/configs/z16f2800100zcog/src/Makefile b/configs/z16f2800100zcog/src/Makefile
index a479cdbe2fc..33ac4263bcc 100644
--- a/configs/z16f2800100zcog/src/Makefile
+++ b/configs/z16f2800100zcog/src/Makefile
@@ -70,8 +70,8 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	rm -f libboard$(LIBEXT) *~
-	if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call CLEAN)
 
 distclean: clean
 	rm -f Make.dep .depend
diff --git a/configs/z80sim/Make.defs b/configs/z80sim/Make.defs
index 2e4c6db47b9..75b6de6c83d 100644
--- a/configs/z80sim/Make.defs
+++ b/configs/z80sim/Make.defs
@@ -82,6 +82,10 @@ define ARCHIVE
 	$(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; }
 endef
 
+define CLEAN
+	@rm -f *.asm *.rel *.lst *.rst *.sym *.adb *.lnk *.map *.mem *.ihx *.hex
+endef
+
 MKDEP			= $(TOPDIR)/tools/mkdeps.sh
 
 HOSTCC			= gcc
diff --git a/configs/z80sim/src/Makefile b/configs/z80sim/src/Makefile
index fba996597c8..472037c5850 100644
--- a/configs/z80sim/src/Makefile
+++ b/configs/z80sim/src/Makefile
@@ -67,9 +67,8 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend
 
 clean:
-	rm -f libboard$(LIBEXT)
-	rm -f *.asm *.rel *.lst *.rst *.sym *.adb *.lnk *.map *.mem *.ihx *.hex *~
-	if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call CLEAN)
 
 distclean: clean
 	rm -f Make.dep .depend