diff --git a/ChangeLog b/ChangeLog
index e5c1b9c6e..ecd228933 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-21  Carl Worth  <cworth@cworth.org>
 
+	* TODO: Add items on custom caps and getting access to hidden
+	image data
+
 	* Makefile.am (EXTRA_DIST): Add COPYING-LGPL-2.1 and
 	COPYING-MPL-1.1 to the distribution.
 
diff --git a/TODO b/TODO
index d06fee883..2f594ec5b 100644
--- a/TODO
+++ b/TODO
@@ -58,10 +58,19 @@ functions:
    cairo_mark_dirty
 
 * Re-implement the trapezoid rasterization algorithm according to the
-new "specification".
+  new "specification".
 
 * Stroking closed, degenerate paths should still draw caps.  Round
-caps are easy; square should probably draw an axis aligned square.
+  caps are easy; square should probably draw an axis-aligned square.
+
+* It would be nice if the user had a mechanism to reliably draw custom
+  caps. One approach here would be to provide the coordinates of the
+  butt cap faces so that the user can append seamless caps to the
+  current path. We may also need to provide the coordinates of the
+  faces of every dash as well.
+
+* We need a way to get at the image data after something
+  like cairo_surface_create_similar with the image backend.
 
 * Verification, profiling, optimization.