diff --git a/Makefile.ac b/Makefile.ac
index ddd09e2928..d32a65b2e7 100644
--- a/Makefile.ac
+++ b/Makefile.ac
@@ -50,10 +50,7 @@ help:
 	@echo "'paparazzi-make AIRCRAFT=<ac_name> [sim|ap.<action>|fbw.<action>|clean_ac]' where <action> is 'compile' or 'upload'"
 
 init:
-	@echo "Copying config example in your $(PAPARAZZI_HOME) directory"
-	@mkdir -p $(PAPARAZZI_HOME)
-	cp -a conf $(PAPARAZZI_HOME)
-	cp -a data $(PAPARAZZI_HOME)
+	@[ -d $(PAPARAZZI_HOME) ] || (echo "Copying config example in your $(PAPARAZZI_HOME) directory"; mkdir -p $(PAPARAZZI_HOME); cp -a conf $(PAPARAZZI_HOME); cp -a data $(PAPARAZZI_HOME); mkdir -p var/maps; mv $(PAPARAZZI_HOME)/data/maps/trtqtttqtsrrt*.jpg $(PAPARAZZI_HOME)/var/maps)
 
 demo: ac1 ac2 ac3
 	PAPARAZZI_HOME=$(PAPARAZZI_HOME) PAPARAZZI_SRC=$(PAPARAZZI_SRC) $(SUPERVISION)
diff --git a/Makefile.install b/Makefile.install
index 8ad1b863e4..6b68757e43 100644
--- a/Makefile.install
+++ b/Makefile.install
@@ -16,6 +16,7 @@ install_data:
 	$(INSTALL) -d $(DESTDIR)/data/maps
 	$(INSTALLDATA) data/maps/*.xml data/maps/*.gif $(DESTDIR)/data/maps
 	$(INSTALL) -d $(DESTDIR)/data/pictures
+	$(INSTALLDATA) var/maps/trtqtttqtsrrt*.jpg $(DESTDIR)/data/maps
 	$(INSTALLDATA) data/pictures/*.gif data/pictures/*.svg data/pictures/*.jpg data/pictures/*.png $(DESTDIR)/data/pictures
 	$(INSTALL) -d $(DESTDIR)/data/srtm
 	$(INSTALLDATA) data/srtm/N43E001.hgt.bz2 $(DESTDIR)/data/srtm
diff --git a/conf/conf.xml.example b/conf/conf.xml.example
index d2c0332cb8..580f71b937 100644
--- a/conf/conf.xml.example
+++ b/conf/conf.xml.example
@@ -91,7 +91,7 @@
     airframe="airframes/twinjet1.xml" 
     radio="radios/cockpitMM.xml" 
     telemetry="telemetry/default.xml"
-    flight_plan="flight_plans/generic.xml"
+    flight_plan="flight_plans/versatile.xml"
     settings="settings/tuning.xml"
     gui_color="#ba6293"
   />
diff --git a/conf/control_panel.xml.example b/conf/control_panel.xml.example
index d8b0b0a9d8..42df27d03c 100644
--- a/conf/control_panel.xml.example
+++ b/conf/control_panel.xml.example
@@ -55,7 +55,7 @@
 
   <section name="sessions">
 
-    <session name="Muret sim">
+    <session name="1 Simple Sim">
       <program name="server"><arg flag="-n"/></program>
       <program name="sim"><arg flag="-a" constant="MJ5"/></program>
       <program name="gcs">
@@ -66,7 +66,7 @@
       <program name="gaia"/>
     </session>
 
-    <session name="Generic sim">
+    <session name="2 Versatile Sim">
       <program name="server"/>     
       <program name="gcs">
 <!--    <arg flag="-mplayer" constant="rtsp://localhost:7070/webcam"/> -->
@@ -75,14 +75,14 @@
       <program name="messages"><arg flag="-c" constant="telemetry:*"/><arg flag="-c" constant="ground:ground"/></program>
     </session>
 
-    <session name="Multi-A/C sim">
+    <session name="3 Multi-A/C Sim">
       <program name="sim"><arg flag="-a" constant="MJ5"/></program>
       <program name="sim"><arg flag="-a" constant="TJ1"/></program>
       <program name="server"/>
       <program name="gcs"/>
     </session>
 
-   <session name="Generic flight">
+   <session name="4 Versatile Flight">
       <program name="link">
         <arg flag="-d" constant="/dev/paparazzi/xbee"/>
         <arg flag="-transport" constant="xbee"/>