diff --git a/Makefile.ac b/Makefile.ac
index c4209b43b7..ddd09e2928 100644
--- a/Makefile.ac
+++ b/Makefile.ac
@@ -37,11 +37,7 @@ FLIGHT_PLAN_H=$(ACINCLUDE)/flight_plan.h
 FLIGHT_PLAN_XML=$(ACINCLUDE)/flight_plan.xml
 SETTINGS_H=$(ACINCLUDE)/settings.h
 MAKEFILE_AC=$(ACINCLUDE)/Makefile.ac
-ifeq ($(PAPARAZZI_SRC),/usr/share/paparazzi)
-SUPERVISION=paparazzi
-else
 SUPERVISION=sw/supervision/paparazzi.pl
-endif
 MAKE=make PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME)
 
 
diff --git a/Makefile.install b/Makefile.install
index 4108001ec2..a5819aa1ca 100644
--- a/Makefile.install
+++ b/Makefile.install
@@ -33,7 +33,8 @@ install_conf:
 
 install_bin:
 	install -d $(PREFIX)/bin/
-	install sw/supervision/paparazzi.pl $(PREFIX)/bin/paparazzi
+	install -d $(DESTDIR)/sw/supervision
+	install sw/supervision/paparazzi.pl $(DESTDIR)/sw/supervision
 	install paparazzi-make $(PREFIX)/bin/
 	install -d $(DESTDIR)/sw/simulator
 	install sw/simulator/gaia $(DESTDIR)/sw/simulator
@@ -48,6 +49,7 @@ install_bin:
 	install sw/logalizer/play $(DESTDIR)/sw/logalizer
 	install sw/logalizer/plot.pl $(DESTDIR)/sw/logalizer
 	ln -sf ../share/paparazzi/sw/ground_segment/cockpit/gcs $(PREFIX)/bin/paparazzi-gcs
+	ln -sf ../share/paparazzi/sw/supervision/paparazzi.pl $(PREFIX)/bin/paparazzi
 
 install_libs:
 	install -d $(PREFIX)/lib/perl5/Paparazzi