diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index e7fc593..e7a77a0 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.4.  Last change: 2016 Sep 11
+*todo.txt*      For Vim version 8.0.  Last change: 2016 Sep 12
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -34,9 +34,13 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+After 8.0 is released:
+- Drop support for older MS-Windows systems, before XP.
+  Patch from Ken Takata, 2016 Mar 8.
+
 +channel:
 - channel_wait() may return an error while there is still something to read.
-  Perhaps try to read once?
+  Perhaps try to read once more?
 - Problem with stderr on Windows? (Vincent Rischmann, 2016 Aug 31, #1026)
 - Add 'cwd' argument to start_job(): directory to change to in the child.
     check for valid directory before forking.
@@ -52,7 +56,6 @@
   Feb 9)  How to do this on MS-Windows?
 - For connection to server, a "keep open" flag would be useful.  Retry
   connecting in the main loop with zero timeout.
-Later
 - job_start(): run job in a newly opened terminal.
     With xterm could use -S{pty}.
 
@@ -227,10 +230,6 @@
 Patch to improve indenting for C++ constructor with initializer list.
 (Hirohito Higashi, 2016 Mar 31)
 
-After 8.0 is released:
-- Drop support for older MS-Windows systems, before XP.
-  Patch from Ken Takata, 2016 Mar 8.
-
 Add stronger encryption.  Could use libsodium (NaCl).
 https://github.com/jedisct1/libsodium/
 Possibly include the needed code so that it can be build everywhere.