diff --git a/Makefile b/Makefile
index 6044b42f05..618351409d 100644
--- a/Makefile
+++ b/Makefile
@@ -247,9 +247,14 @@ cleanspaces:
 	find ./conf -name '*.xml' -exec sed -i {} -e 's/[ \t]*$$//' ';'
 
 distclean : dist_clean
-dist_clean : clean
-	rm -r conf/srtm_data
-	rm -r conf/maps_data conf/maps.xml
+dist_clean : 
+	@echo "Warning: This remove all non-repository files. This means you will loose your aircraft list, your maps, your logfiles, ... if you want this, then run: make dist_clean_irirreversible"
+
+dist_clean_irreversible: clean
+	rm -rf conf/srtm_data
+	rm -rf conf/maps_data conf/maps.xml
+	rm -rf conf/conf.xml conf/controlpanel.xml
+	rm -rf var
 
 ab_clean:
 	find sw/airborne -name '*~' -exec rm -f {} \;
@@ -260,6 +265,9 @@ test_all_example_airframes:
 	$(MAKE) AIRCRAFT=Tiny_IMU clean_ac ap
 	$(MAKE) AIRCRAFT=EasyStar_ETS clean_ac ap sim
 
+test_all_example_airframes2: all
+	for ap in `grep name conf/conf.xml.example | sed -e 's/.*name=\"//' | sed -e 's/"//'`; do echo "Making $$ap"; make -C ./ AIRCRAFT=$$ap clean_ac ap.compile;   done
+
 commands: paparazzi sw/simulator/launchsitl
 
 paparazzi: