diff --git a/conf/autopilot/rotorcraft.makefile b/conf/autopilot/rotorcraft.makefile
index 07274c0b94..e42d413483 100644
--- a/conf/autopilot/rotorcraft.makefile
+++ b/conf/autopilot/rotorcraft.makefile
@@ -95,12 +95,12 @@ endif
 ap.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 ap.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport
 ap.CFLAGS += -DDOWNLINK_DEVICE=$(MODEM_PORT)
-ap.srcs   += $(SRC_FIRMWARE)/telemetry.c \
-		             downlink.c \
-			     pprz_transport.c
+ap.srcs   += $(SRC_FIRMWARE)/telemetry.c
+ap.srcs   += downlink.c
+ap.srcs   += pprz_transport.c
 ap.CFLAGS += -DDATALINK=PPRZ
 ap.CFLAGS += -DPPRZ_UART=$(MODEM_PORT)
-ap.srcs   += $(SRC_BOOZ)/booz2_datalink.c
+ap.srcs   += $(SRC_FIRMWARE)/datalink.c
 ap.CFLAGS += -DUSE_$(MODEM_PORT) -D$(MODEM_PORT)_BAUD=$(MODEM_BAUD)
 
 ifeq ($(ARCH), lpc21)
diff --git a/sw/airborne/booz/booz2_datalink.c b/sw/airborne/firmwares/rotorcraft/datalink.c
similarity index 100%
rename from sw/airborne/booz/booz2_datalink.c
rename to sw/airborne/firmwares/rotorcraft/datalink.c