diff --git a/Makefile.am b/Makefile.am
index 304c8a2..c092b62 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ win32/config.mk win32/Makefile win32/test/Makefile.win32 win32/libssh2_lib.dsp \
 win32/libssh2_config.h win32/tests.dsp win32/rules.mk
 
 EXTRA_DIST = $(WIN32FILES) buildconf $(NETWAREFILES) get_ver.awk HACKING \
- maketgz NMakefile
+ maketgz NMakefile TODO
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..61f4a91
--- /dev/null
+++ b/TODO
@@ -0,0 +1,30 @@
+Things TODO
+===========
+
+* Add one of the missing man pages:
+
+  libssh2_channel_receive_window_adjust
+  libssh2_channel_request_pty_size_ex
+  libssh2_channel_window_read_ex
+  libssh2_channel_window_write_ex
+  libssh2_publickey_add_ex
+  libssh2_publickey_init
+  libssh2_publickey_list_fetch
+  libssh2_publickey_list_free
+  libssh2_publickey_remove_ex
+  libssh2_publickey_shutdown
+  libssh2_session_flag
+  libssh2_session_get_blocking
+  libssh2_userauth_hostbased_fromfile_ex
+
+* Decrease the number of mallocs. Everywhere.
+
+* Use SO_NOSIGPIPE for Mac OS/BSD systems where MSG_NOSIGNAL doesn't exist/work
+
+* Extend the test suite to actually test lots of aspects of libssh2
+
+
+At next SONAME bump
+===================
+
+* remove libssh2_base64_decode() from the API/ABI
\ No newline at end of file