diff --git a/TODO.txt b/TODO.txt
index 6fbc6d785..69eaff1a0 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,12 +1,8 @@
-TODO list (no particular order)
-
-- confirmation before applying templates (Gabriel)
-- trims 2 offsets (french forum)
-- optimization for extra dblsize chars (se: 16 used when 6 needed)
-- FAAST option in protocol to enable startPulses before the splash screen (Cam)
-- DSM2 channel order (Cam)
-- Variometer (rate as cm/sec)
-- Customizable telemetry views
-- Telemetry value averaging
-- Trace telemetry data
-
+TODO list (no particular order)
+
+- Trims 2 offsets (french forum)
+- Optimization for extra dblsize chars (se: 16 used when 6 needed)
+- DSM2 channel order (Cam)
+- Variometer (rate as cm/sec)
+- Telemetry value averaging
+- Trace telemetry data
diff --git a/changelog.txt b/changelog.txt
index 4b47cbb87..9f68c4c04 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,18 @@
+******************************************
+CHANGELOG: 15-03-2012  BSS
+FAAST option in protocol to enable startPulses before the splash screen
+Telemetry configurable screen
+Confirmation before applying templates
+Used channels cleaned before applying a template
+
+******************************************
+CHANGELOG: 14-03-2012  BSS
+Potscroll option added
+
+******************************************
+
+Version 364:
+
 ******************************************
 CHANGELOG: 04-03-2012  BSS
 New EEPROM format 205