diff --git a/docs/index.htm b/docs/index.htm
index 0306dd7359..d60bbe837b 100644
--- a/docs/index.htm
+++ b/docs/index.htm
@@ -78,7 +78,8 @@
     <li>Licence:
         <a href="preamble.txt">Preamble</a>, <a href="licence.txt">Licence</a>, <a href="licendoc.txt">Documentation Licence</a>, <a href="lgpl.txt">L-GPL</a>, <a href="gpl.txt">GPL</a>
     </li>
-
+    </ul>
+    
     <!-- FIXME: FAQs are very out-of-date; should be moved in the wx docs or
                 to the website or to the wiki...
 
@@ -104,10 +105,6 @@
     </li>
     -->
 
-    <!-- FIXME: todo lists are in the wiki now....  -->
-    <li>ToDo: <a href="todo.txt"><b>General ToDo</b></a>, <a href="gtk/todo.txt">wxGTK</a>, <a href="motif/todo.txt">wxMotif</a>, <a href="mac/todo.txt">wxMac</a></li>
-    </ul>
-
 
 
     <!--
@@ -170,14 +167,16 @@
     <ul>
       <li><a href="tech/index.txt">Index of technical notes</a></li>
       <li><a href="tech/">Technical notes</a></li>
-
-      <!-- FIXME: should be either removed or integrated with doxy docs
-      <li><a href="platform.htm">Platforms supported</a></font></li>
-      <li><a href="i18n.htm">Languages supported by wxWidgets</a></font></li>
-      -->
     </ul>
 
+    <p>TODO list for wxWidgets:</p>
 
+    <ul>
+      <li><a href="http://www.wxwidgets.org/wiki/index.php/Development:_Todo_List">wxWiki TODO list</a></li>
+      <li><a href="doxygen/out/html/todo.html">Documentation TODO list</a></li>
+    </ul>
+    
+    
 
     <!--
         DEMOS