diff --git a/ChangeLog b/ChangeLog
index 5d59f554ad..fe268c3bbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-10  Wim Taymans  <wim@fluendo.com>
+
+	* docs/design/part-TODO.txt:
+	Updated todo.
+
 2005-11-10  Wim Taymans  <wim@fluendo.com>
 
 	* gst/base/gstbasesink.c: (gst_base_sink_do_sync):
diff --git a/docs/design/part-TODO.txt b/docs/design/part-TODO.txt
index da2e3c71a4..61994c7158 100644
--- a/docs/design/part-TODO.txt
+++ b/docs/design/part-TODO.txt
@@ -1,8 +1,5 @@
-
-- changing an object's name after construction is not allowed. Checks are performed
-  when adding objects to parents that no duplicate names are used, changing the name
-  to a duplicate name after adding it is therefore allowed and voids internal
-  consistency.
+API/ABI
+-------
 
 - implement return values from events in addition to the gboolean. This should be
   done by making the event contain a GstStructure with input/output values, similar
@@ -10,16 +7,6 @@
   after the seek you want to get the new stream time that will actually be used to
   update the slider bar.
 
-- unlinking pads in the PAUSED state needs to make sure the stream thread is not
-  executing code. Can this be done with a flush to unlock all downstream chain
-  functions? Do we do this automatically or let the app handle this?
-
-- implement clock selection as explained in part-gstpipeline.txt. 
-
-- when a pipeline with a live source goes to PAUSED again, a sample is prerolled
-  in the sinks. This sample should be discarded, possibly with a flush event
-  started from the source.
-
 - convert framerate to GstFraction in GstCaps.
 
 - implement latency calculation for live sources.
@@ -47,3 +34,21 @@
 
 - query POSITION/DURATION return accuracy. Just a flag or accuracy percentage.
 
+
+IMPLEMENTATION
+--------------
+
+- implement clock selection as explained in part-gstpipeline.txt. 
+
+
+DESIGN
+------
+
+- unlinking pads in the PAUSED state needs to make sure the stream thread is not
+  executing code. Can this be done with a flush to unlock all downstream chain
+  functions? Do we do this automatically or let the app handle this?
+
+- when a pipeline with a live source goes to PAUSED again, a sample is prerolled
+  in the sinks. This sample should be discarded, possibly with a flush event
+  started from the source.
+