diff --git a/sw/logalizer/sd2log.ml b/sw/logalizer/sd2log.ml
index 07dcd7622c..2090e97a22 100644
--- a/sw/logalizer/sd2log.ml
+++ b/sw/logalizer/sd2log.ml
@@ -1,7 +1,34 @@
+(*
+ * $Id$
+ *
+ * Extraction of .log and .data file from a .TLM airborne SD file
+ *  
+ * Copyright (C) 2009 ENAC, Pascal Brisset
+ *
+ * This file is part of paparazzi.
+ *
+ * paparazzi is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * paparazzi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with paparazzi; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA. 
+ *
+ *)
+
 open Printf
 module U = Unix
 let (//) = Filename.concat
 let logs_path = Env.paparazzi_home // "var" // "logs"
+let conf_xml = Xml.parse_file (Env.paparazzi_home // "conf" // "conf.xml")
 
 
 module Tm_Pprz = Pprz.Messages (struct let name = "telemetry" end)
@@ -14,6 +41,41 @@ let run_command = fun com ->
     exit 1;
   end
 
+let make_element = fun t a c -> Xml.Element (t,a,c)
+
+
+(** Copied from server.ml *)
+let expand_ac_xml = fun ac_conf ->
+  let prefix = fun s -> sprintf "%s/conf/%s" Env.paparazzi_home s in
+  let parse = fun a ->
+    let file = prefix (ExtXml.attrib ac_conf a) in
+    try
+      Xml.parse_file file
+    with
+      Xml.File_not_found _ ->
+	prerr_endline (sprintf "File not found: %s" file);
+	make_element "file_not_found" ["file",a] []
+    | Xml.Error e ->
+	let s = Xml.error e in
+	prerr_endline (sprintf "Parse error in %s: %s" file s);
+	make_element "cannot_parse" ["file",file;"error", s] [] in
+  let fp = parse "flight_plan" in
+  let af = parse "airframe" in
+  let rc = parse "radio" in
+  let children = Xml.children ac_conf@[fp; af; rc] in
+  make_element (Xml.tag ac_conf) (Xml.attribs ac_conf) children
+
+let log_xml = fun ac_id timeofday data_file ->
+  let select = fun x -> ExtXml.int_attrib x "ac_id" = ac_id in
+  let conf_ac = ExtXml.child ~select conf_xml "aircraft" in
+  let expanded_conf_ac = expand_ac_xml conf_ac in
+  let expanded_conf =
+    make_element (Xml.tag conf_xml) (Xml.attribs conf_xml) [expanded_conf_ac] in
+  make_element 
+    "configuration"
+    ["time_of_day", string_of_float timeofday; "data_file", data_file]
+    [expanded_conf; Pprz.messages_xml ()]
+
 
   
 let convert_file = fun file ->
@@ -22,27 +84,34 @@ let convert_file = fun file ->
   let f_in = open_in file
   and f_out = open_out tmp_file in
 
-  let start_unix_time = ref None in
+  let start_unix_time = ref None
+  and single_ac_id = ref (-1) in
 
   let use_payload = fun payload ->
     let log_msg = Logpprz.parse payload in
     let (msg_id, ac_id, vs) = 
       Tm_Pprz.values_of_payload log_msg.Logpprz.pprz_data in
-    let msg_descr = Tm_Pprz.message_of_id msg_id in
-    let timestamp = Int32.to_float log_msg.Logpprz.timestamp /. 1e4 in
-    fprintf f_out "%.3f %d %s\n" timestamp ac_id (Tm_Pprz.string_of_message msg_descr vs);
 
-    (** Looking for a date from a GPS message *)
-    if !start_unix_time = None
-	&& msg_descr.Pprz.name = "GPS"
-	&& Pprz.int_assoc "mode" vs = 3 then
-      let itow = Pprz.int_assoc "itow" vs / 1000
-      and week = Pprz.int_assoc "week" vs in
-      printf "itow=%d week=%d\n%!" itow week;
-      let unix_time = Latlong.unix_time_of_tow ~week itow in
-      start_unix_time := Some (unix_time -. timestamp)
+    if !single_ac_id < 0 then
+      single_ac_id := ac_id;
+
+    if ac_id <> !single_ac_id then
+      fprintf stderr "Disarding message with ac_id %d, previous one was %d\n%!" ac_id !single_ac_id
+    else
+      let msg_descr = Tm_Pprz.message_of_id msg_id in
+      let timestamp = Int32.to_float log_msg.Logpprz.timestamp /. 1e4 in
+      fprintf f_out "%.3f %d %s\n" timestamp ac_id (Tm_Pprz.string_of_message msg_descr vs);
+      
+      (** Looking for a date from a GPS message *)
+      if !start_unix_time = None
+	  && msg_descr.Pprz.name = "GPS"
+	  && Pprz.int_assoc "mode" vs = 3 then
+	let itow = Pprz.int_assoc "itow" vs / 1000
+	and week = Pprz.int_assoc "week" vs in
+	let unix_time = Latlong.unix_time_of_tow ~week itow in
+	start_unix_time := Some (unix_time -. timestamp)
   in
-
+  
   let parser = Parser.parse use_payload in
   let Serial.Closure reader = Serial.input parser in
 
@@ -63,15 +132,25 @@ let convert_file = fun file ->
 
       let d = U.localtime start_time in
       let basename = sprintf "%02d_%02d_%02d__%02d_%02d_%02d_SD" (d.U.tm_year mod 100) (d.U.tm_mon+1) (d.U.tm_mday) (d.U.tm_hour) (d.U.tm_min) (d.U.tm_sec) in
-      let data_name = sprintf "%s.data" basename in
+      let data_name = sprintf "%s.data" basename
+      and log_name = sprintf "%s.log" basename
+      and tlm_name = sprintf "%s.tlm" basename in
 
       (** Move the produced .data file *)
       let com = sprintf "mv %s %s" tmp_file (logs_path // data_name) in
       run_command com;
+      fprintf stderr "%s file produced\n%!" data_name;
+
+      (** Save the corresponding .log fie *)
+      let f = open_out (logs_path // log_name) in
+      output_string f (Xml.to_string_fmt (log_xml !single_ac_id start_time data_name));
+      close_out f;
+      fprintf stderr "%s file produced\n%!" log_name;
 
       (** Save the original binary file *)
-      let com = sprintf "mv %s %s" tmp_file (logs_path // data_name) in
-      run_command com
+      let com = sprintf "cp %s %s" file (logs_path // tlm_name) in
+      run_command com;
+      fprintf stderr "%s file saved\n%!" tlm_name
 
 let () =
   if Array.length Sys.argv = 2 then