diff --git a/conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_rc.xml b/conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_rc.xml
index b455885d32..221b1d185c 100644
--- a/conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_rc.xml
+++ b/conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_rc.xml
@@ -14,8 +14,7 @@
             <subsystem name="radio_control" type="spektrum"/>
             <define name="RADIO_MODE" value="RADIO_AUX1"/>
             <define name="RADIO_KILL_SWITCH" value="RADIO_GEAR"/>
-            <define name="RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT" value="UART5"/>
-            <define name="OVERRIDE_UART5_IRQ_HANDLER"/>
+            <configure name="USE_SECONDARY_SPEKTRUM_RECEIVER" value="1"/>
         </target>
 
         <target name="nps" board="pc">
diff --git a/conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml b/conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
index 06c7642f92..819220c84d 100644
--- a/conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
+++ b/conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
@@ -15,8 +15,7 @@
             <subsystem name="radio_control" type="spektrum"/>
             <define name="RADIO_MODE" value="RADIO_AUX1"/>
             <define name="RADIO_KILL_SWITCH" value="RADIO_GEAR"/>
-            <define name="RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT" value="UART5"/>
-            <define name="OVERRIDE_UART5_IRQ_HANDLER"/>
+            <configure name="USE_SECONDARY_SPEKTRUM_RECEIVER" value="1"/>
         </target>
 
         <target name="nps" board="pc">
diff --git a/conf/airframes/examples/quadrotor_lisa_m_2_pwm.xml b/conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
similarity index 89%
rename from conf/airframes/examples/quadrotor_lisa_m_2_pwm.xml
rename to conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
index 3e6c0b3020..e133cef851 100644
--- a/conf/airframes/examples/quadrotor_lisa_m_2_pwm.xml
+++ b/conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
@@ -1,21 +1,32 @@
 <!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
-<!-- this is a quadrotor frame equiped with Lisa/M 2.0 and PWM motor controllers -->
+<!-- this is a quadrotor frame equiped with
+     * Autopilot:   Lisa/M 2.0             http://paparazzi.enac.fr/wiki/Lisa/M_v20
+     * IMU:         Aspirin 2.1            http://paparazzi.enac.fr/wiki/AspirinIMU
+     * Actuators:   PWM motor controllers  http://paparazzi.enac.fr/wiki/Subsystem/actuators#PWM_Supervision
+     * GPS:         Ublox                  http://paparazzi.enac.fr/wiki/Subsystem/gps
+     * RC:          two Spektrum sats      http://paparazzi.enac.fr/wiki/Subsystem/radio_control#Spektrum
+-->
 
-<airframe name="fraser">
+<airframe name="Quadrotor LisaM_2.0 pwm">
 
   <firmware name="rotorcraft">
-    <target name="ap" board="lisa_m_2.0"/>
+    <target name="ap" board="lisa_m_2.0">
+      <subsystem name="radio_control" type="spektrum">
+        <define name="RADIO_MODE" value="RADIO_AUX1"/>
+        <configure name="USE_SECONDARY_SPEKTRUM_RECEIVER" value="1"/>
+      </subsystem>
+    </target>
 
     <target name="nps" board="pc">
-      <subsystem name="fdm"           type="nps"/>
+      <subsystem name="fdm" type="nps"/>
+      <subsystem name="radio_control" type="ppm"/>
     </target>
 
     <subsystem name="actuators"     type="pwm_supervision">
       <define name="SERVO_HZ" value="400"/>
     </subsystem>
 
-    <subsystem name="radio_control" type="ppm"/>
     <subsystem name="telemetry"     type="transparent"/>
     <subsystem name="imu"           type="aspirin_v2.1"/>
     <subsystem name="gps"           type="ublox"/>
diff --git a/conf/airframes/examples/quadrotor_lisa_m_mkk.xml b/conf/airframes/examples/quadrotor_lisa_m_mkk.xml
index 5df1e1e91b..208bf7ac60 100644
--- a/conf/airframes/examples/quadrotor_lisa_m_mkk.xml
+++ b/conf/airframes/examples/quadrotor_lisa_m_mkk.xml
@@ -1,8 +1,14 @@
 <!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
-<!-- this is a quadrotor frame equiped with Lisa/M 1.0 and MKK motor controllers -->
+<!-- this is a quadrotor frame equiped with
+     * Autopilot:   Lisa/M 1.0             http://paparazzi.enac.fr/wiki/Lisa/M_v10
+     * IMU:         Aspirin 1.5            http://paparazzi.enac.fr/wiki/AspirinIMU
+     * Actuators:   MKK motor controllers  http://paparazzi.enac.fr/wiki/Subsystem/actuators#MKK
+     * GPS:         Ublox                  http://paparazzi.enac.fr/wiki/Subsystem/gps
+     * RC:          any PPM system         http://paparazzi.enac.fr/wiki/Subsystem/radio_control#PPM
+-->
 
-<airframe name="fraser">
+<airframe name="Quadrotor LisaM_1.0 mkk">
 
   <firmware name="rotorcraft">
     <target name="ap" board="lisa_m_1.0">
diff --git a/conf/airframes/esden/calib/asp21-000.xml b/conf/airframes/obsolete/esden/calib/asp21-000.xml
similarity index 100%
rename from conf/airframes/esden/calib/asp21-000.xml
rename to conf/airframes/obsolete/esden/calib/asp21-000.xml
diff --git a/conf/airframes/esden/calib/asp21-default.xml b/conf/airframes/obsolete/esden/calib/asp21-default.xml
similarity index 100%
rename from conf/airframes/esden/calib/asp21-default.xml
rename to conf/airframes/obsolete/esden/calib/asp21-default.xml
diff --git a/conf/airframes/esden/calib/aspirin_012.xml b/conf/airframes/obsolete/esden/calib/aspirin_012.xml
similarity index 100%
rename from conf/airframes/esden/calib/aspirin_012.xml
rename to conf/airframes/obsolete/esden/calib/aspirin_012.xml
diff --git a/conf/airframes/esden/calib/aspirin_jtm.xml b/conf/airframes/obsolete/esden/calib/aspirin_jtm.xml
similarity index 100%
rename from conf/airframes/esden/calib/aspirin_jtm.xml
rename to conf/airframes/obsolete/esden/calib/aspirin_jtm.xml
diff --git a/conf/airframes/esden/jt_lisam.xml b/conf/airframes/obsolete/esden/jt_lisam.xml
similarity index 98%
rename from conf/airframes/esden/jt_lisam.xml
rename to conf/airframes/obsolete/esden/jt_lisam.xml
index f01d75739c..8f4e9bb32b 100644
--- a/conf/airframes/esden/jt_lisam.xml
+++ b/conf/airframes/obsolete/esden/jt_lisam.xml
@@ -185,8 +185,7 @@
       <define name="RADIO_MODE" value="RADIO_AUX2"/>
       <define name="RADIO_KILL_SWITCH" value="RADIO_GEAR"/>
       <define name="RADIO_CONTROL_SPEKTRUM_SIGNS" value="\{1,1,-1,1,-1,-1,-1,1,1,1,1,1\}"/>
-      <define name = "RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT" value = "UART5"/>
-      <define name = "OVERRIDE_UART5_IRQ_HANDLER"/>
+      <configure name="USE_SECONDARY_SPEKTRUM_RECEIVER" value="1"/>
     </target>
     <target name="sim" board="pc">
       <subsystem name="fdm"           type="nps"/>
diff --git a/conf/airframes/esden/lisa_asctec.xml b/conf/airframes/obsolete/esden/lisa_asctec.xml
similarity index 100%
rename from conf/airframes/esden/lisa_asctec.xml
rename to conf/airframes/obsolete/esden/lisa_asctec.xml
diff --git a/conf/airframes/esden/lisa_asctec_aspirin.xml b/conf/airframes/obsolete/esden/lisa_asctec_aspirin.xml
similarity index 100%
rename from conf/airframes/esden/lisa_asctec_aspirin.xml
rename to conf/airframes/obsolete/esden/lisa_asctec_aspirin.xml
diff --git a/conf/airframes/esden/lisa_m_2_asp_2_pwm.xml b/conf/airframes/obsolete/esden/lisa_m_2_asp_2_pwm.xml
similarity index 100%
rename from conf/airframes/esden/lisa_m_2_asp_2_pwm.xml
rename to conf/airframes/obsolete/esden/lisa_m_2_asp_2_pwm.xml
diff --git a/conf/airframes/esden/lisa_m_pwm.xml b/conf/airframes/obsolete/esden/lisa_m_pwm.xml
similarity index 100%
rename from conf/airframes/esden/lisa_m_pwm.xml
rename to conf/airframes/obsolete/esden/lisa_m_pwm.xml
diff --git a/conf/airframes/esden/lisa_pwm_aspirin.xml b/conf/airframes/obsolete/esden/lisa_pwm_aspirin.xml
similarity index 98%
rename from conf/airframes/esden/lisa_pwm_aspirin.xml
rename to conf/airframes/obsolete/esden/lisa_pwm_aspirin.xml
index ba20f5f612..c48884a3d3 100644
--- a/conf/airframes/esden/lisa_pwm_aspirin.xml
+++ b/conf/airframes/obsolete/esden/lisa_pwm_aspirin.xml
@@ -189,8 +189,7 @@
       <define name="RADIO_MODE" value="RADIO_AUX2"/>
       <define name="RADIO_KILL_SWITCH" value="RADIO_GEAR"/>
       <define name="RADIO_CONTROL_SPEKTRUM_SIGNS" value="\{1,1,-1,1,-1,-1,-1,1,1,1,1,1\}"/>
-      <define name = "RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT" value = "UART5"/>
-      <define name = "OVERRIDE_UART5_IRQ_HANDLER"/>
+      <configure name="USE_SECONDARY_SPEKTRUM_RECEIVER" value="1"/>
     </target>
     <target name="nps" board="pc">
       <subsystem name="fdm"           type="nps"/>
diff --git a/conf/airframes/esden/synerani_4B.xml b/conf/airframes/obsolete/esden/synerani_4B.xml
similarity index 98%
rename from conf/airframes/esden/synerani_4B.xml
rename to conf/airframes/obsolete/esden/synerani_4B.xml
index 662721bc48..fb0271fa7a 100644
--- a/conf/airframes/esden/synerani_4B.xml
+++ b/conf/airframes/obsolete/esden/synerani_4B.xml
@@ -192,8 +192,7 @@
       <define name="RADIO_MODE" value="RADIO_AUX2"/>
       <define name="RADIO_KILL_SWITCH" value="RADIO_GEAR"/>
       <define name="RADIO_CONTROL_SPEKTRUM_SIGNS" value="\{1,1,-1,1,-1,-1,-1,1,1,1,1,1\}"/>
-      <define name = "RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT" value = "UART5"/>
-      <define name = "OVERRIDE_UART5_IRQ_HANDLER"/>
+      <configure name="USE_SECONDARY_SPEKTRUM_RECEIVER" value="1"/>
     </target>
     <target name="sim" board="pc">
       <subsystem name="fdm"           type="nps"/>
diff --git a/conf/conf.xml.example b/conf/conf.xml.example
index 00c52c50b5..bdf772c3da 100644
--- a/conf/conf.xml.example
+++ b/conf/conf.xml.example
@@ -25,9 +25,9 @@
     gui_color="white"
     />
   <aircraft
-    name="Quad_LisaM"
+    name="Quad_LisaM_2"
     ac_id="162"
-    airframe="airframes/examples/quadrotor_lisa_m_2_pwm.xml"
+    airframe="airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml"
     radio="radios/cockpitSX.xml"
     telemetry="telemetry/default_rotorcraft.xml"
     flight_plan="flight_plans/rotorcraft_basic.xml"