diff --git a/todo/Makefile b/todo/Makefile
new file mode 100644
index 000000000..7670e940b
--- /dev/null
+++ b/todo/Makefile
@@ -0,0 +1,5 @@
+all: todo.html
+
+todo.html: todo.xml todo.xsl
+ xsltproc todo.xsl todo.xml > todo.html
+
diff --git a/todo/todo.xml b/todo/todo.xml
new file mode 100644
index 000000000..fe05f1a6c
--- /dev/null
+++ b/todo/todo.xml
@@ -0,0 +1,21 @@
+
+
+ -
+ Some methods need to accept null arguments.
+ gtk.defs has "is-null" metadata tags, this needs to be
+translated/added to the XML metadata and implemented in generator.
+ Bug #26405.
+ 0
+
+ -
+ Gtk+ docs must be merged in.
+ The docs generated for Gtk+, et al need to be merged into the doc-string attributes, and then output by generator.
+ rachel
+ 50
+
+ -
+ Gdk drawing primitives not fully supported.
+ Many Gdk drawing functions are named oddly and are not being generated as methods of Drawable. gapi2xml.pl needs to take this into account.
+ 0
+
+
diff --git a/todo/todo.xsl b/todo/todo.xsl
new file mode 100644
index 000000000..d4109ddb1
--- /dev/null
+++ b/todo/todo.xsl
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+Gtk# TODO
+
+
+
+
+
+
+
+
+ |
+| Description | |
+| Status | % |
+| Notes | |
+| Wrangler | |
+
+
+
+
+
+
+
+
+
+
+
+
+
+