diff --git a/doc/TODO b/doc/TODO
index 2026d7f81c..033547c6b6 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -32,15 +32,14 @@ Michael's TODO list: (unordered) (if anyone wanna help with sth, just ask)
 -------------------
 - finish implementation of WMV2 j-picture
 - H264 encoder
-- H264 deblock filter
 - H264 B frames
-- H264 CABAC
+- optimize H264 CABAC
 - per MB ratecontrol (so VCD and such do work better)
 - more optimizations
 - simper rate control
 - split h263.c
-- mpeg2 encoding (after the ME impovements)
-- format idependant quality parameter
+- reverse engeneer RV30/RV40
+- finish NUT implementation
 
 Francois' TODO list: (unordered, without any timeframe)
 -------------------
@@ -71,3 +70,5 @@ unassigned TODO: (stuff which should/must be done but noone seems to do it)
   http://ccrma-www.stanford.edu/~jos/resample/resample.html
 - add seeking support to the command line
 - generate optimal huffman tables for mjpeg encoding
+- fix ffserver regression tests
+