diff --git a/TODO b/TODO
index 7bb2a9e8..b0ee13ec 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,14 @@
 Emacs interface (notmuch.el)
 ----------------------------
 
+Portability
+-----------
+Fix configure script to test each compiler warning we want to use.
+
+Implement strndup locally (or call talloc_strndup instead).
+
+Implement getline locally, (look at gnulib).
+
 Completion
 ----------
 Fix bash completion to complete multiple search options (both --first