diff --git a/TODO b/TODO
index d7a951e18..6fb0da875 100644
--- a/TODO
+++ b/TODO
@@ -546,3 +546,22 @@ is very poorly designed and essentially impossible for us to use:
 
 particularly if we also want to maintain backwards compatibility with
 Ruby 1.8, and/or maintain volatile VALUEs on the stack.
+
+virt-builder
+------------
+
+ - set keyboard
+
+ - set default timezone and language
+
+ - the initial download of the template can take quite a long time
+   and needs a progress bar
+
+ - how can we debug it?  at least document how to call virt-rescue
+   guestfish etc to look at files
+
+ - how can we give users a shell?
+
+ - use a single log file and dump it out on command failure
+
+ - Ubuntu templates