diff --git a/sw/lib/ocaml/logpprz.ml b/sw/lib/ocaml/logpprz.ml
new file mode 100644
index 0000000000..0649ae5f67
--- /dev/null
+++ b/sw/lib/ocaml/logpprz.ml
@@ -0,0 +1,102 @@
+(*
+ * $Id$
+ *
+ * Reading logged timestamped messages
+ *  
+ * Copyright (C) 2003 Pascal Brisset, Antoine Drouin
+ *
+ * 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
+
+type message = {
+    source : int;
+    timestamp : int32;
+    pprz_data : Serial.payload
+  }
+
+
+module Transport = struct
+  let stx = Char.chr 0x99 (** sw/airborne/pprz_transport.h *)
+  let offset_length = 1
+  let offset_source = 2
+  let offset_timestamp = 3
+  let offset_payload = 2
+
+  let index_start = fun buf ->
+    String.index buf stx
+
+  let length = fun buf start ->
+    let len = String.length buf - start in
+    if len > offset_length then
+      let l = Char.code buf.[start+offset_length] in
+      Debug.call 'T' (fun f -> fprintf f "LogPprz len=%d\n" l);
+      l + 8 (* pprz data + stx, length, source, time, ck *)
+    else
+      raise Serial.Not_enough
+
+  let (+=) = fun r x -> r := (!r + x) land 0xff
+  let compute_checksum = fun msg ->
+    let l = String.length msg in
+    let ck_a = ref 0 in
+    for i = 1 to l - 2 do
+      ck_a += Char.code msg.[i]
+    done;
+    !ck_a
+
+  let checksum = fun msg ->
+    let l = String.length msg in
+    let ck_a = compute_checksum msg in
+    Debug.call 'T' (fun f -> fprintf f "LogPprz cs: %d %d\n" ck_a (Char.code msg.[l-1]));
+    ck_a = Char.code msg.[l-1]
+
+  let payload = fun msg ->
+    let l = String.length msg in
+    assert(Char.code msg.[offset_length] + 8 = l);
+    Serial.payload_of_string (String.sub msg offset_payload (l-3))
+
+  let packet = fun payload ->
+    let payload = Serial.string_of_payload payload in
+    let n = String.length payload in
+    let msg_length = n + 3 in (** + stx, len, ck_a *)
+    if msg_length >= 256 then
+      invalid_arg "Pprz.Transport.packet";
+    let m = String.create msg_length in
+    String.blit payload 0 m offset_payload n;
+    m.[0] <- stx;
+    m.[offset_length] <- Char.chr (msg_length - 8);
+    let ck_a = compute_checksum m in
+    m.[msg_length-1] <- Char.chr ck_a;
+    m
+end
+
+let pprz_payload_of_payload = fun s ->
+  let n = String.length s in
+  Serial.payload_of_string (String.sub s 5 (n - 5))
+
+let parse = fun p ->
+  let s = Serial.string_of_payload p in
+  let source = Char.code s.[0]
+  and timestamp = Pprz.int32_of_bytes s 1 in
+  {
+    source = source;
+    timestamp = timestamp;
+    pprz_data = pprz_payload_of_payload s
+  }
diff --git a/sw/lib/ocaml/logpprz.mli b/sw/lib/ocaml/logpprz.mli
new file mode 100644
index 0000000000..1b710da019
--- /dev/null
+++ b/sw/lib/ocaml/logpprz.mli
@@ -0,0 +1,12 @@
+type message = {
+    source : int;
+    timestamp : int32;
+    pprz_data : Serial.payload
+  }
+
+module Transport : Serial.PROTOCOL
+(** Pprz frame stored by the logger *)
+
+val parse : Serial.payload -> message
+
+
diff --git a/sw/lib/ocaml/test/test_logpprz.ml b/sw/lib/ocaml/test/test_logpprz.ml
new file mode 100644
index 0000000000..a058afec33
--- /dev/null
+++ b/sw/lib/ocaml/test/test_logpprz.ml
@@ -0,0 +1,25 @@
+module Tm_Pprz = Pprz.Messages (struct let name = "telemetry" end)
+
+module Parser = Serial.Transport(Logpprz.Transport)
+  
+let convert_file = fun file ->
+  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
+    Printf.printf "%.3f %d %s\n" (Int32.to_float log_msg.Logpprz.timestamp /. 1e4) ac_id (Tm_Pprz.string_of_message msg_descr vs)  in
+
+  let parser = Parser.parse use_payload in
+  let Serial.Closure reader = Serial.input parser in
+
+  let f = open_in file in
+  try
+    while true do
+      reader (Unix.descr_of_in_channel f)
+    done
+  with
+    End_of_file -> ()
+
+let () =
+  convert_file Sys.argv.(1)