diff --git a/conf/airframes/examples/microjet.xml b/conf/airframes/examples/microjet.xml
index e74c8a18f7..06ba1a31bf 100644
--- a/conf/airframes/examples/microjet.xml
+++ b/conf/airframes/examples/microjet.xml
@@ -202,7 +202,7 @@
     <load name="nav_line_osam.xml"/>
     <load name="nav_survey_poly_osam.xml"/>
     <load name="nav_vertical_raster.xml"/>
-    <load name="nav_bungee_takefoff.xml"/>
+    <load name="nav_bungee_takeoff.xml"/>
     <load name="infrared_adc.xml"/>
     <load name="digital_cam_servo.xml">
       <define name="DC_SHUTTER_SERVO" value="COMMAND_SHUTTER" />
diff --git a/conf/airframes/examples/microjet_lisa_m.xml b/conf/airframes/examples/microjet_lisa_m.xml
index 3a6080021c..ea6ff954dc 100644
--- a/conf/airframes/examples/microjet_lisa_m.xml
+++ b/conf/airframes/examples/microjet_lisa_m.xml
@@ -1,16 +1,16 @@
 <!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <!-- Microjet Multiplex (http://www.multiplex-rc.de/)
-     Lisa/M v1.0 board (http://paparazzi.enac.fr/wiki/Lisa/M_v10)
-     Aspirin IMU v1.5
+     Lisa/M v2.0 board (http://paparazzi.enac.fr/wiki/Lisa/M_v20)
+     Aspirin IMU v2.1
      Xbee modem in transparent mode
 -->
 
-<airframe name="Microjet Lisa/M 1.0">
+<airframe name="Microjet Lisa/M 2.0">
 
   <firmware name="fixedwing">
     <target name="sim" 	board="pc"/>
-    <target name="ap"   board="lisa_m_1.0">
+    <target name="ap"   board="lisa_m_2.0">
       <configure name="PERIODIC_FREQUENCY" value="120"/>
       <configure name="AHRS_PROPAGATE_FREQUENCY" value="100"/>
       <configure name="AHRS_CORRECT_FREQUENCY" value="100"/>
@@ -21,19 +21,13 @@
     <define name="STRONG_WIND"/>
 
     <define name="USE_BAROMETER" value="TRUE"/>
-
     <subsystem name="radio_control" type="ppm"/>
 
     <!-- Communication -->
     <subsystem name="telemetry" 	type="transparent"/>
 
     <!-- Sensors -->
-    <subsystem name="imu"           type="aspirin_v1.5">
-      <define name="ASPIRIN_ACCEL_RATE" value="ADXL345_RATE_100HZ"/>
-      <define name="ASPIRIN_GYRO_LOWPASS" value="ITG3200_DLPF_42HZ"/>
-      <!-- gyro: internal freq 1kHz, output freq 100Hz -->
-      <define name="ASPIRIN_GYRO_SMPLRT_DIV" value="9"/>
-    </subsystem>
+    <subsystem name="imu"           type="aspirin_v2.1"/>
     <subsystem name="gps"           type="ublox"/>
 
     <subsystem name="ahrs"          type="int_cmpl_quat"/>
@@ -45,6 +39,21 @@
   <modules>
     <load name="sys_mon.xml"/>
     <load name="baro_sim.xml"/>
+
+    <!-- extra navigation routines -->
+    <load name="nav_bungee_takeoff.xml"/>
+    <load name="nav_line.xml"/>
+    <load name="nav_line_border.xml"/>
+    <load name="nav_line_osam.xml"/>
+    <load name="nav_flower.xml"/>
+    <load name="nav_smooth.xml"/>
+    <load name="nav_survey_poly_adv.xml"/>
+    <load name="nav_survey_poly_osam.xml"/>
+    <load name="nav_vertical_raster.xml"/>
+
+    <load name="digital_cam_servo.xml">
+      <define name="DC_SHUTTER_SERVO" value="COMMAND_SHUTTER" />
+    </load>
   </modules>
 
   <servos>
@@ -57,6 +66,7 @@
     <axis name="THROTTLE" failsafe_value="0"/>
     <axis name="ROLL"     failsafe_value="0"/>
     <axis name="PITCH"    failsafe_value="0"/>
+    <axis name="SHUTTER"  failsafe_value="0"/>
   </commands>
 
   <rc_commands>
diff --git a/conf/conf_example.xml b/conf/conf_example.xml
index c0f2666c93..cd3ff4d714 100644
--- a/conf/conf_example.xml
+++ b/conf/conf_example.xml
@@ -74,6 +74,16 @@
    settings=" settings/fixedwing_basic.xml settings/control/ctl_energy.xml settings/estimation/ins_neutrals.xml settings/estimation/ac_char.xml"
    gui_color="#ffffffffffff"
   />
+  <aircraft
+   name="Microjet_LisaM"
+   ac_id="4"
+   airframe="airframes/examples/microjet_lisa_m.xml"
+   radio="radios/cockpitSX.xml"
+   telemetry="telemetry/default_fixedwing_imu.xml"
+   flight_plan="flight_plans/nav_modules.xml"
+   settings=" settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/control/ctl_dash_loiter_trim.xml settings/estimation/ins_neutrals.xml"
+   gui_color="blue"
+  />
   <!-- tiny/umarim -->
   <aircraft
     name="Microjet"
diff --git a/conf/flight_plans/nav_modules.xml b/conf/flight_plans/nav_modules.xml
index bebc4e0dd8..9f7443d325 100644
--- a/conf/flight_plans/nav_modules.xml
+++ b/conf/flight_plans/nav_modules.xml
@@ -3,7 +3,11 @@
 <flight_plan alt="260" ground_alt="185" lat0="43.46223" lon0="1.27289" max_dist_from_home="1500" name="Basic" security_height="25">
   <header>
 #include "subsystems/datalink/datalink.h"
-</header>
+
+#include "modules/digital_cam/dc.h"
+#define LINE_START_FUNCTION dc_Survey(40);
+#define LINE_STOP_FUNCTION dc_autoshoot = DC_AUTOSHOOT_STOP;
+  </header>
   <waypoints>
     <waypoint name="HOME" x="0" y="0"/>
     <waypoint name="STDBY" x="49.5" y="100.1"/>