diff --git a/Makefile b/Makefile
index 618351409d..c7d1973cf3 100644
--- a/Makefile
+++ b/Makefile
@@ -233,11 +233,11 @@ fast_deb:
 	$(MAKE) deb OCAMLC=ocamlc.opt DEBFLAGS=-b
 
 clean:
-	rm -fr dox build-stamp configure-stamp conf/%gconf.xml debian/files debian/paparazzi-arm7 debian/paparazzi-avr debian/paparazzi-base debian/paparazzi-bin debian/paparazzi-dev
-	rm -f  $(MESSAGES_H) $(MESSAGES2_H) $(UBX_PROTOCOL_H) $(MTK_PROTOCOL_H) $(DL_PROTOCOL_H)
-	find . -mindepth 2 -name Makefile -exec sh -c '$(MAKE) -C `dirname {}` $@' \;
-	find . -name '*~' -exec rm -f {} \;
-	rm -f paparazzi sw/simulator/launchsitl
+	$(Q)rm -fr dox build-stamp configure-stamp conf/%gconf.xml debian/files debian/paparazzi-arm7 debian/paparazzi-avr debian/paparazzi-base debian/paparazzi-bin debian/paparazzi-dev
+	$(Q)rm -f  $(MESSAGES_H) $(MESSAGES2_H) $(UBX_PROTOCOL_H) $(MTK_PROTOCOL_H) $(DL_PROTOCOL_H)
+	$(Q)find . -mindepth 2 -name Makefile -exec sh -c 'echo "Cleaning {}"; $(MAKE) -C `dirname {}` $@' \;
+	$(Q)find . -name '*~' -exec rm -f {} \;
+	$(Q)rm -f paparazzi sw/simulator/launchsitl
 
 cleanspaces:
 	find ./sw/airborne -name '*.[ch]' -exec sed -i {} -e 's/[ \t]*$$//' \;
diff --git a/data/maps/Makefile b/data/maps/Makefile
index 9a676c715c..d17507da42 100644
--- a/data/maps/Makefile
+++ b/data/maps/Makefile
@@ -3,6 +3,9 @@ Q=@
 
 all: $(DATADIR)/maps.google.com $(PAPARAZZI_HOME)/conf/maps.xml
 
+clean:
+	
+
 $(DATADIR):
 	mkdir $(DATADIR)
 
diff --git a/data/srtm/Makefile b/data/srtm/Makefile
index 0e24687031..80ac333eee 100644
--- a/data/srtm/Makefile
+++ b/data/srtm/Makefile
@@ -3,6 +3,9 @@ Q=@
 
 SRTMData: $(DATADIR)/Africa $(DATADIR)/Australia $(DATADIR)/Eurasia $(DATADIR)/Islands $(DATADIR)/North_America $(DATADIR)/South_America
 
+clean:
+	
+
 $(DATADIR):
 	mkdir $(DATADIR)
 
@@ -29,3 +32,4 @@ $(DATADIR)/South_America: $(DATADIR)
 %.hgt.zip: SRTMData
 	$(Q)wget -c -nv -N http://dds.cr.usgs.gov/srtm/version2_1/SRTM3/$(shell grep -l $(@F) $(DATADIR)/* | sed -e s#$(DATADIR)/##)/$(@F)
 
+
diff --git a/sw/ground_segment/misc/Makefile b/sw/ground_segment/misc/Makefile
index 9e15b25a0f..d7cf0118fb 100644
--- a/sw/ground_segment/misc/Makefile
+++ b/sw/ground_segment/misc/Makefile
@@ -10,7 +10,7 @@ endif
 all: davis2ivy kestrel2ivy
 
 clean:
-	rm *.o davis2ivy kestrel2ivy
+	rm -f *.o davis2ivy kestrel2ivy
 
 davis2ivy: davis2ivy.o
 	g++ -o davis2ivy davis2ivy.o  $(LIBRARYS)  -livy
diff --git a/sw/ground_segment/tmtc/GSM/Makefile b/sw/ground_segment/tmtc/GSM/Makefile
index e731282280..697b8399d9 100644
--- a/sw/ground_segment/tmtc/GSM/Makefile
+++ b/sw/ground_segment/tmtc/GSM/Makefile
@@ -4,4 +4,4 @@ SMS_GS: SMS_Ground_UDtest_final.c
 	gcc -g -O2 -Wall `pkg-config --cflags glib-2.0 gtk+-2.0` -L/usr/lib -lglibivy -o SMS_GS SMS_Ground_UDtest_final.c `pkg-config --libs glib-2.0 gtk+-2.0` -lglibivy
 
 clean:
-	rm SMS_GS
+	rm -f SMS_GS
diff --git a/sw/in_progress/satcom/Makefile b/sw/in_progress/satcom/Makefile
index 339fb51001..0c780f676d 100644
--- a/sw/in_progress/satcom/Makefile
+++ b/sw/in_progress/satcom/Makefile
@@ -10,4 +10,4 @@ tcp2ivy_generic: tcp2ivy_generic.c
 	gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -I../../../var/${AIRCRAFT} -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy -lm
 
 clean:
-	rm email2udp udp2tcp tcp2ivy
+	rm -f email2udp udp2tcp tcp2ivy
diff --git a/sw/simulator/old_booz/tests/Makefile b/sw/simulator/old_booz/tests/Makefile
index 35c5ec7f91..13d0e57905 100644
--- a/sw/simulator/old_booz/tests/Makefile
+++ b/sw/simulator/old_booz/tests/Makefile
@@ -68,3 +68,6 @@ TEST_SENSORS_SRCS = test_sensors.c                            \
 
 test_sensors : $(TEST_SENSORS_SRCS)
 	gcc $(CFLAGS) -o $@ $^ $(LDFLAGS)
+
+clean:
+