diff --git a/conf/boards/lisa_m_1.0.makefile b/conf/boards/lisa_m_1.0.makefile
index c10f49f2cd..ce53ca3c06 100644
--- a/conf/boards/lisa_m_1.0.makefile
+++ b/conf/boards/lisa_m_1.0.makefile
@@ -1,7 +1,8 @@
+# Hey Emacs, this is a -*- makefile -*-
 #
 # lisa_m_1.0.makefile
 #
-# http://paparazzi.enac.fr/wiki/User/LisaM
+# http://paparazzi.enac.fr/wiki/Lisa/M
 #
 
 BOARD=lisa_m
@@ -51,9 +52,13 @@ ifndef SYS_TIME_LED
 SYS_TIME_LED = 1
 endif
 
-
+ifndef RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT
 RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT   = UART3
+endif
+
+ifndef RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT
 RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT = UART5
+endif
 
 ifndef MODEM_PORT
 MODEM_PORT=UART2
diff --git a/conf/boards/lisa_m_2.0.makefile b/conf/boards/lisa_m_2.0.makefile
index 02a5e4c8e7..2e9f366483 100644
--- a/conf/boards/lisa_m_2.0.makefile
+++ b/conf/boards/lisa_m_2.0.makefile
@@ -1,14 +1,12 @@
 # Hey Emacs, this is a -*- makefile -*-
 
-include $(PAPARAZZI_SRC)/conf/boards/lisa_m_1.0.makefile
-
 #
 # Swap GPS UART with spektrum UART
 #
 RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT   = UART1
-GPS_PORT=UART3
 
-#
-# Disable aligner led for now.
-#
-AHRS_ALIGNER_LED = none
+ifndef GPS_PORT
+GPS_PORT=UART3
+endif
+
+include $(PAPARAZZI_SRC)/conf/boards/lisa_m_1.0.makefile