diff --git a/conf/autopilot/subsystems/booz_gps_skytraq.makefile b/conf/autopilot/subsystems/booz_gps_skytraq.makefile
deleted file mode 100644
index 86daafe44b..0000000000
--- a/conf/autopilot/subsystems/booz_gps_skytraq.makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-ap.srcs += $(SRC_BOOZ)/booz_gps.c
-ap.CFLAGS += -DBOOZ_GPS_TYPE_H=\"gps/booz_gps_skytraq.h\"
-ap.srcs += $(SRC_BOOZ)/gps/booz_gps_skytraq.c
-ifeq ($(ARCHI), arm7)
-ap.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B38400 -DUART0_VIC_SLOT=5
-ap.CFLAGS += -DUSE_GPS -DGPS_LINK=Uart0 -DGPS_LED=4
-else ifeq ($(ARCHI), stm32) 
-ap.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B38400
-ap.CFLAGS += -DUSE_GPS -DGPS_LINK=Uart1 -DGPS_LED=3
-endif
-
-sim.CFLAGS += -DUSE_GPS
-sim.srcs += $(SRC_BOOZ)/booz_gps.c
diff --git a/conf/autopilot/subsystems/booz_gps_ublox.makefile b/conf/autopilot/subsystems/booz_gps_ublox.makefile
deleted file mode 100644
index e3253a966d..0000000000
--- a/conf/autopilot/subsystems/booz_gps_ublox.makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-ap.srcs += $(SRC_BOOZ)/booz_gps.c
-ap.CFLAGS += -DBOOZ_GPS_TYPE_H=\"gps/booz_gps_ubx.h\"
-ap.srcs += $(SRC_BOOZ)/gps/booz_gps_ubx.c
-ifeq ($(ARCHI), arm7)
-ap.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B38400 -DUART0_VIC_SLOT=5
-ap.CFLAGS += -DUSE_GPS -DGPS_LINK=Uart0 -DGPS_LED=4
-else ifeq ($(ARCHI), stm32) 
-ap.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B38400
-ap.CFLAGS += -DUSE_GPS -DGPS_LINK=Uart1 -DGPS_LED=3
-endif
-sim.CFLAGS += -DUSE_GPS
-sim.srcs += $(SRC_BOOZ)/booz_gps.c
diff --git a/conf/autopilot/subsystems/rotorcraft/gps_skytraq.makefile b/conf/autopilot/subsystems/rotorcraft/gps_skytraq.makefile
new file mode 100644
index 0000000000..f9d0fb6b7c
--- /dev/null
+++ b/conf/autopilot/subsystems/rotorcraft/gps_skytraq.makefile
@@ -0,0 +1,15 @@
+
+ap.srcs += $(SRC_BOOZ)/booz_gps.c
+ap.CFLAGS += -DBOOZ_GPS_TYPE_H=\"gps/booz_gps_skytraq.h\"
+ap.srcs += $(SRC_BOOZ)/gps/booz_gps_skytraq.c
+
+ap.CFLAGS += -DUSE_$(GPS_PORT) -D$(GPS_PORT)_BAUD=$(GPS_BAUD)
+ap.CFLAGS += -DUSE_GPS -DGPS_LINK=$(GPS_PORT) -DGPS_LED=$(GPS_LED)
+
+ifeq ($(ARCHI), arm7)
+ap.CFLAGS += -D$(GPS_PORT)_VIC_SLOT=5
+endif
+
+
+sim.CFLAGS += -DUSE_GPS
+sim.srcs += $(SRC_BOOZ)/booz_gps.c