diff --git a/conf/boards/booz_1.0.h b/conf/boards/booz_1.0.h
deleted file mode 100644
index 38fe834415..0000000000
--- a/conf/boards/booz_1.0.h
+++ /dev/null
@@ -1,103 +0,0 @@
-#ifndef CONFIG_BOOZ2_V1_0_H
-#define CONFIG_BOOZ2_V1_0_H
-
-/* Master oscillator freq.       */
-#define FOSC (12000000) 
-
-/* PLL multiplier                */
-#define PLL_MUL (5)         
-
-/* CPU clock freq.               */
-#define CCLK (FOSC * PLL_MUL) 
-
-/* Peripheral bus speed mask 0x00->4, 0x01-> 1, 0x02 -> 2   */
-#define PBSD_BITS 0x02    
-#define PBSD_VAL 2
-
-/* Peripheral bus clock freq. */
-#define PCLK (CCLK / PBSD_VAL) 
-
-/* Onboard LEDs */
-#define LED_1_BANK 1
-#define LED_1_PIN 25
-
-#define LED_2_BANK 1
-#define LED_2_PIN 24
-
-#define LED_3_BANK 1
-#define LED_3_PIN 23
-
-#define LED_4_BANK 1
-#define LED_4_PIN 31
-
-#define LED_5_BANK 1
-#define LED_5_PIN 18
-
-#define POWER_SWITCH_LED 5
-
-#define LED_6_BANK 1
-#define LED_6_PIN 22
-
-#define CAM_SWITCH_LED 6
-
-
-/* PPM : rc rx on P0.28 ( CAP0.2 ) */
-#define PPM_PINSEL PINSEL1
-#define PPM_PINSEL_VAL 0x02
-#define PPM_PINSEL_BIT 24
-#define PPM_CRI TIR_CR2I
-#define PPM_CCR_CRF TCCR_CR2_F
-#define PPM_CCR_CRR TCCR_CR2_R
-#define PPM_CCR_CRI TCCR_CR2_I
-#define PPM_CR T0CR2
-
-
-/* ADC */
-
-/* pressure : P0.10 AD1.2 */
-#define ANALOG_BARO_PINSEL PINSEL0
-#define ANALOG_BARO_PINSEL_VAL 0x03
-#define ANALOG_BARO_PINSEL_BIT 20
-#define ANALOG_BARO_ADC 1
-
-
-
-/* MS2001 on SSP, IMU connector */
-#define MS2001_SS_PIN   28
-#define MS2001_SS_IODIR IO1DIR
-#define MS2001_SS_IOSET IO1SET
-#define MS2001_SS_IOCLR IO1CLR
-
-#define MS2001_RESET_PIN   19
-#define MS2001_RESET_IODIR IO1DIR
-#define MS2001_RESET_IOSET IO1SET
-#define MS2001_RESET_IOCLR IO1CLR
-
-#define MS2001_DRDY_PIN  30
-#define MS2001_DRDY_PINSEL PINSEL1
-#define MS2001_DRDY_PINSEL_BIT 28
-#define MS2001_DRDY_PINSEL_VAL 2
-#define MS2001_DRDY_EINT 3
-#define MS2001_DRDY_VIC_IT VIC_EINT3
-
-/* PWM5 on CAM connector */
-/* P0.21 */
-#define PWM0_PINSEL PINSEL1
-#define PWM0_PINSEL_VAL 0x01
-#define PWM0_PINSEL_BIT 10
-
-/* PWM2 on SPI connector */
-/* P0.7 */
-#define PWM1_PINSEL PINSEL0
-#define PWM1_PINSEL_VAL 0x02
-#define PWM1_PINSEL_BIT 14
-
-
-/*
- * Modem
- */
-//#define MODEM_DEVICE Uart1
-//#define MODEM_UART_FLAG 
-
-
-#endif /* CONFIG_BOOZ2_V1_0_H */
diff --git a/conf/boards/booz_1.0.makefile b/conf/boards/booz_1.0.makefile
index 35ecac8fa7..ee17921bf2 100644
--- a/conf/boards/booz_1.0.makefile
+++ b/conf/boards/booz_1.0.makefile
@@ -1,11 +1,13 @@
 #
-# booz.makefile
+# booz_1.0.makefile
 #
 # http://paparazzi.enac.fr/wiki/Booz
 #
 ARCH=lpc21
 ARCHI=arm7
-BOARD_CFG = \"boards/booz_1.0.h\"
+BOARD=booz
+BOARD_VERSION=1.0
+BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
 
 ifndef FLASH_MODE
 FLASH_MODE = IAP
@@ -13,10 +15,12 @@ endif
 
 #
 #
-# some default values for current firmwares
+# some default values shared between different firmwares
 #
 #
 
+SYS_TIME_LED = 1
+
 RADIO_CONTROL_LED  = 1
 RADIO_CONTROL_LINK = UART0
 
diff --git a/conf/boards/lisa_l_1.0.h b/conf/boards/lisa_l_1.0.h
deleted file mode 100644
index 90668c0ad5..0000000000
--- a/conf/boards/lisa_l_1.0.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef CONFIG_LISA_V1_0_H
-#define CONFIG_LISA_V1_0_H
-
-
-#define AHB_CLK 72000000
-
-/* Lisa uses an external clock instead of a crystal */
-#define HSE_TYPE_EXT_CLK
-
-/* Onboard LEDs */
-#define LED_1_BANK 
-#define LED_STP08
-
-// FIXME, this is just to make it compile
-#define POWER_SWITCH_LED 5
-
-
-
-#endif /* CONFIG_LISA_V1_0_H */
diff --git a/conf/boards/lisa_l_1.0.makefile b/conf/boards/lisa_l_1.0.makefile
index 087fa5c07d..7c0a893458 100644
--- a/conf/boards/lisa_l_1.0.makefile
+++ b/conf/boards/lisa_l_1.0.makefile
@@ -6,7 +6,9 @@
 
 ARCH=stm32
 ARCHI=stm32
-BOARD_CFG=\"boards/lisa_l_1.0.h\"
+BOARD=lisa_l
+BOARD_VERSION=1.0
+BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
 ifndef FLASH_MODE
 FLASH_MODE = JTAG
 endif
@@ -17,6 +19,8 @@ endif
 #
 #
 
+SYS_TIME_LED       = 1
+
 RADIO_CONTROL_LED  = 5
 RADIO_CONTROL_LINK = UART3