diff --git a/README.multi-tty b/README.multi-tty
index f32a475e3fd..3bced7e6580 100644
--- a/README.multi-tty
+++ b/README.multi-tty
@@ -386,6 +386,12 @@ is probably not very interesting for anyone else.)
 THINGS TO DO
 ------------
 
+** emacsclient --no-wait and --eval is currently broken.
+
+** xt-mouse.el needs to be adapted for multi-tty.  It currently
+   signals an error on kill-emacs under X, which prevents the user
+   from exiting Emacs. (Reported by Mnemonikk on freenode.)
+
 ** The handling of lisp/term/*.el, and frame creation in general, is a
    big, big mess.  How come the terminal-specific file is loaded by
    tty-create-frame-with-faces?  I don't think it is necessary to load