diff --git a/conf/airframes/twinstar1.xml b/conf/airframes/twinstar1.xml
index 320055f69b..1095b52a6e 100644
--- a/conf/airframes/twinstar1.xml
+++ b/conf/airframes/twinstar1.xml
@@ -1,4 +1,4 @@
-<airframe name="Thon1" ctl_board="V1_2_1" gps="SAM_LS">
+<airframe name="Twin1" ctl_board="V1_2_1" gps="SAM_LS">
   <section name="adc" prefix="ADC_CHANNEL_">
     <define name="IR1" value="1"/>
     <define name="IR2" value="2"/>
diff --git a/conf/airframes/twinstar2.xml b/conf/airframes/twinstar2.xml
index 85a4fa5a76..7a391218e9 100644
--- a/conf/airframes/twinstar2.xml
+++ b/conf/airframes/twinstar2.xml
@@ -1,4 +1,4 @@
-<airframe name="Thon2" ctl_board="V1_2_1" gps="SAM_LS">
+<airframe name="Twin2" ctl_board="V1_2_1" gps="SAM_LS">
   <section name="adc" prefix="ADC_CHANNEL_">
     <define name="IR1" value="1"/>
     <define name="IR2" value="2"/>
diff --git a/conf/install.xml b/conf/install.xml
index 0c6a043517..c7e5e61285 100644
--- a/conf/install.xml
+++ b/conf/install.xml
@@ -2,7 +2,6 @@
 
 <section name="binaries" dest="bin" comment="main program">
   <file name="sw/supervision/paparazzi.pl"/>
-  <!-- TMP -->  <file name="paparazzi_demo"/>
 </section>
 
 <section name="priv_binaries" dest="share/paparazzi/bin" comment="helpers program">
@@ -97,13 +96,13 @@
  <file name="conf/radios/fc28.xml"/>
 </section>
 
-<section name="data_SRTM" dest="share/paparazzi/data/SRTM">
+<section name="data_SRTM" dest="share/paparazzi/data/srtm">
  <file name="data/SRTM/N43E001.hgt"/>
 </section>
 
 <section name="data_maps" dest="share/paparazzi/data/maps">
- <file name="data/maps/muret_UTM.xml"/>
- <file name="data/maps/muret_UTM.gif"/>
+ <file name="data/maps/garmisch.xml"/>
+ <file name="data/maps/garmisch.gif"/>
  <file name="data/maps/nasa_strasbourg.xml"/>
  <file name="data/maps/nasa_strasbourg.jpg"/>
 </section>
@@ -265,12 +264,4 @@
    <file name="var/include/ubx_protocol.h"/>
 </section>
 
-<section name="var_Thon1_sim" dest="share/paparazzi/var/Thon1/sim">
-   <file name="var/Thon1/sim/simsitl"/>
-</section>
-
-<section name="var_Thon2_sim" dest="share/paparazzi/var/Thon2/sim">
-   <file name="var/Thon2/sim/simsitl"/>
-</section>
-
 </install>
diff --git a/debian/control b/debian/control
index 932e287607..66ddfe05f1 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.6.1
 
 Package: paparazzi
 Architecture: i386
-Depends: ivy-c-dev, ivy-c, ivy-perl, libsubject-perl, zinc-perl, zinc-tk, ivy-ocaml, xml-light-ocaml, libxml-dom-perl, libpcre3-dev, liblablgtk2-ocaml-dev, gcc-avr, avr-libc, binutils-avr, libexpect-perl, libgnomecanvas2-dev, libcamlimages-ocaml-dev, uisp, libfile-ncopy-perl, libtext-csv-perl, digikit, make, gcc, patch, boa
+Depends: ivy-c-dev, ivy-c, ivy-perl, libsubject-perl, zinc-perl, zinc-tk, ivy-ocaml, xml-light-ocaml, libxml-dom-perl, libpcre3-dev, liblablgtk2-ocaml-dev, gcc-avr, avr-libc, binutils-avr, libexpect-perl, libgnomecanvas2-dev, libcamlimages-ocaml-dev, uisp, libfile-ncopy-perl, libtext-csv-perl, digikit, make, gcc, patch, boa, dia-gnome, tetex-extra
 Description: Paparazzi Meta Package