diff --git a/conf/Makefile.install b/conf/Makefile.install
index e73246442e..10ce801b38 100644
--- a/conf/Makefile.install
+++ b/conf/Makefile.install
@@ -46,17 +46,6 @@ install_bin:
 	install sw/simulator/simsitl.pl $(DESTDIR)/bin/
 	install sw/ground_segment/cockpit/cockpit.pl $(DESTDIR)/bin/
 	install sw/ground_segment/tmtc/server $(DESTDIR)/bin/
-	install -t  $(DESTDIR)/bin/ sw/tools/*.out
-	install -t  $(DESTDIR)/bin/ sw/tools/extract_makefile.ml
-	install -t  $(DESTDIR)/bin/ sw/tools/gen_aircraft.ml
-	install -t  $(DESTDIR)/bin/ sw/tools/gen_airframe.ml
-	install -t  $(DESTDIR)/bin/ sw/tools/gen_calib.ml
-	install -t  $(DESTDIR)/bin/ sw/tools/gen_control.ml
-	install -t  $(DESTDIR)/bin/ sw/tools/gen_flight_plan.ml
-	install -t  $(DESTDIR)/bin/ sw/tools/gen_messages.ml
-	install -t  $(DESTDIR)/bin/ sw/tools/gen_periodic.ml
-	install -t  $(DESTDIR)/bin/ sw/tools/gen_radio.ml
-	install -t  $(DESTDIR)/bin/ sw/tools/gen_ubx.ml
 
 install_libs:
 	install -d $(PREFIX)/lib/perl5/Paparazzi
@@ -75,6 +64,19 @@ install_libs:
 install_tools:
 	install -t $(DESTDIR) Makefile*
 	install -t $(DESTDIR)/conf conf/Makefile*
+	install -t $(DESTDIR)/bin/ sw/tools/*.out
+	install -t $(DESTDIR)/bin/ sw/tools/extract_makefile.ml
+	install -t $(DESTDIR)/bin/ sw/tools/gen_aircraft.ml
+	install -t $(DESTDIR)/bin/ sw/tools/gen_airframe.ml
+	install -t $(DESTDIR)/bin/ sw/tools/gen_calib.ml
+	install -t $(DESTDIR)/bin/ sw/tools/gen_control.ml
+	install -t $(DESTDIR)/bin/ sw/tools/gen_flight_plan.ml
+	install -t $(DESTDIR)/bin/ sw/tools/gen_messages.ml
+	install -t $(DESTDIR)/bin/ sw/tools/gen_periodic.ml
+	install -t $(DESTDIR)/bin/ sw/tools/gen_radio.ml
+	install -t $(DESTDIR)/bin/ sw/tools/gen_ubx.ml
+	install -d $(DESTDIR)/sw/simulator
+	install -t $(DESTDIR)/sw/simulator sw/simulator/Makefile 
 
 install_airborne_sources:
 	install -d $(PREFIX)/sw/
@@ -83,4 +85,5 @@ install_airborne_sources:
 install_skel:
 	cp -a conf $(DESTDIR)/
 	cp -a data $(DESTDIR)/
+	install -d $(DESTDIR)/var
 	cp -a var/Twin3 $(DESTDIR)/var/
diff --git a/pprz_src_test.sh b/pprz_src_test.sh
index f5926e2706..a75954a317 100644
--- a/pprz_src_test.sh
+++ b/pprz_src_test.sh
@@ -1,4 +1,7 @@
 #! /bin/sh
 if test -z "$PAPARAZZI_SRC"; then
     PAPARAZZI_SRC=/usr/share/paparazzi
+    PAPARAZZI_BIN=$PAPARAZZI_SRC/bin
+else
+    PAPARAZZI_BIN=$PAPARAZZI_SRC/sw/tools
 fi
diff --git a/sw/tools/Makefile b/sw/tools/Makefile
index 9510600589..74a2a61738 100644
--- a/sw/tools/Makefile
+++ b/sw/tools/Makefile
@@ -48,7 +48,7 @@ fp_syntax.cmo : fp_syntax.cmi
 	@echo OC $<
 	$(Q)$(OCAMLC) -o $@ ivy-ocaml.cma lib-pprz.cma $<
 	@cat ../../pprz_src_test.sh > $@
-	@echo '$(OCAML) -I $$PAPARAZZI_SRC/sw/lib/ocaml ivy-ocaml.cma lib-pprz.cma $$PAPARAZZI_SRC/sw/tools/$< $$*' >> $@
+	@echo '$(OCAML) -I $$PAPARAZZI_SRC/sw/lib/ocaml ivy-ocaml.cma lib-pprz.cma $$PAPARAZZI_BIN/$< $$*' >> $@
 	@chmod a+x $@
 
 %.cmo : %.ml ../lib/ocaml/lib-pprz.cma