diff --git a/src/TODO b/src/TODO
index c988d6c49..1646f0de9 100644
--- a/src/TODO
+++ b/src/TODO
@@ -4,19 +4,30 @@ Before 4.6.0-pre2
 reimplement "-P" in a safer way (temp file instead of stdout) - possibly
 security issues.
 
-Make xnc.hlp a text file.  Make it easier to translate the manual.
-
 Consider applying a patch from PLD to make M-o propagate the current
 directory to the other panel.
 
+Pressing F8 twice in the viewer causes error messages if the file was
+preprocessed (i.e. gzipped files, manpages).
+
+Add support for mouse wheel with gpm.
+
+Recheck all mouse handlers, make sure that they check button number.
+
+ncurses 5.2 turns off keypad under heavy load on xterm.  Check if
+anything can be done about it.
+
+Implement --with-screen option.
+
+Remove side effects from --with-termcap option.
+
 
 Before 4.6.0
 ============
 
-Hard links in cpio have 0 length (if easy to fix).
+Make xnc.hlp a text file.  Make it easier to translate the manual.
 
-Pressing F8 twice in the viewer causes error messages if the file was
-preprocessed (i.e. gzipped files, manpages).
+Hard links in cpio have 0 length (if easy to fix).
 
 Add "Ignore" and "Ignore all" buttons when reporting permission
 problems.
@@ -30,12 +41,11 @@ Report errors in fish operations and recover from them.
 SMB crash when not starting with the share root, but copying to the
 share root.
 
-Mouse doesn't work with ncurses on xterm and rxvt on some systems.
-
-MC + ncurses + FreeBSD 4.6.2 doesn't recognize cursor keys.
-
 Scan more packages for patches, check Red Hat and Ximian Bugzilla.
 
+Allow colors to be defined in the mc.lib file.  Make it possible to
+avoid using a superlong line to redefine all colors.
+
 
 After 4.6.0
 ===========
@@ -52,6 +62,12 @@ In the 4.7 branch
 
 Internal terminal - no more console saving.
 
+Implement a really Advanced Chown/Chmod.
+
+Dynamic loading for libX11, libgpm.
+
+Process all input internally, use screen libraries only for output.
+
 
 ========================================================================
 Everything below this point is the old TODO list.  It doesn't reflect
@@ -100,8 +116,6 @@ ideas still waiting for their implementation.
    - Write a general grow_string routine.  This code is used in the internal
      viewer and would also be used in the profile.c code.
 
-   - Allow colors to be defined in the mc.lib file.
-
    -  A command to set the line length to a fixed value for viewing
       fixed length binary files. LIST does this with Ctrl-B and then
       prompts for a "record" length.
@@ -121,8 +135,6 @@ ideas still waiting for their implementation.
     (using Janne's Listing mode editor) and assign hot-keys to both
     standard and user defined (what about c-x f [fbl123] ?).
 
-  - Multiple panels - really necessary! [3.x]
-
   - Shift-Home, Shift-End for the input line: home and end.
 
   - Make a mechanism to lock all the mouse events and send them to
@@ -200,7 +212,7 @@ ideas still waiting for their implementation.
     view_update after handling a key, should all the other
     view_updates be removed?
 
-  - If the viewer is too slow, some catching could be done.
+  - If the viewer is too slow, some caching could be done.
     width and cols are currently computed each time they are needed.
 
   - Add context sensitive help to the f9 menus.
@@ -211,8 +223,3 @@ ideas still waiting for their implementation.
     dynamically.  I should take a look at this one day, it's easy to
     fix.
 
-* Binaries distribution
-  - Including all the necessary terminfo databases compiled for
-    different machines, as well as xterm_color for different machines.
-  
-