diff --git a/docs/html/roadmap.htm b/docs/html/roadmap.htm
index c066c92475..7c3f99eb66 100644
--- a/docs/html/roadmap.htm
+++ b/docs/html/roadmap.htm
@@ -50,115 +50,77 @@ but we will endeavour to follow them as closely as possible.<P>
 Note also that the releases described are for wxGTK, wxMSW and wxMotif ports. wxMac currently follows
 its own development path but is due to merge with the main code base in November/December.
 Also, minor snapshot releases for specific platforms may be
-available at dates convenient to the developers.<P>
+available at dates convenient to the developers.
+
+Finally, this page only shows the things which are still left to do, please
+look elsewhere to see the complete list of changes between the releases,
+including the things which are already done.
+<P>
 
 <CENTER>
 <HR> <FONT SIZE=+2><I><B><a name="schedule">Schedule</a></B></I></FONT> <HR>
 </CENTER>
 <P>
 
-<H4>Release 2.1.14</H4>
-
-Release date: March 21st, 2000<P>
-
-This will be the final beta release before the final 2.2 release. It will be
-synchronized for as many platforms as possible (at least Windows and GTK,
-probably Motif and hopefully Mac).
-
-Changes since the last synchronized release (2.1.11):
-
-<ul>
-<li>First beta release of wxBase
-<li>New or significantly improved base classes: wxDateTime, wxLongLong,
-wxCmdLineParser, wxDir, wxStopWatch
-<li>Much better i18n support, encoding conversion on the fly, wxFontMapper
-<li>New wxGrid class
-<li>New wxCalendarCtrl class
-<li>Dynamic toolbar/menubar management
-<li>Better image formats support: TIFF (new), PCX (8 and 24 bit saving added)
-<li>Attributes (custom colours/font) support in wxTreeCtrl, wxListCtrl
-<li>Impressive number of fixed bugs in wxMSW and wxGTK including various
-incompatibilities between the two
-<li>wxIPCxxx classes reworked.
-<li>Several new samples and demos.
-</ul>
-
-<P>
-
-<H4>Release 2.2 (stable)</H4>
-
-Release date: mid. April, 2000.<P>
-
-This is the next stable version of wxWindows. No new features since
-2.1.14 beta.
-
-<ul>
-<li>bugs found during 2.1.14 will be fixed.
-<li>translations of text strings used in wxWindows.
-<li>documentation updated to include all new classes.
-</ul>
-
-<P>
-
-<H4>Release 2.3</H4>
-
-Release date: ?
-
-<ul>
-<li>Context sensitive help.
-<li>More i18n issues: dates, times, ...
-<li>POSIX-like regular expressions support for all platforms.
-<li>Encryption support (interface to OpenSSL).
-<li>Full UDP support in wxSocket
-<li>wxPlot
-<li>XML for resource files.
-<li>Built-in support for configuring key bindings
-</ul>
-
-<P>
-
-<H4>Release 2.4 (stable)</H4>
+<H4>Release 2.4.0 (stable)</H4>
 
 Release date: ?
 
 Stable version of 2.3.
 
-<ul>
-<li>wxMac release.
-<li>wxBeOS port.
-</ul>
+<ol>
+    <li>Very important
+        <ul>
+            <li>wxMac: make the release together with the other ports
+            <li>Fix wxStream::Eof() problems
+            <li>wxGTK: GTK+ 2.0 support
+        </ul>
+
+    <li>Important
+        <ul>
+            <li>(Unix) implement <tt>wx-config</tt> as a version and build
+            parameters independent script which would just read the
+            configuration files
+            <li>Finish wxFileName
+            <li>Make it possible to process the key strokes portably
+            <li>Add wxSemaphor, fix wxCondition
+        </ul>
+
+    <li>Nice to have
+        <ul>
+            <li>support for text in the wxToolBar buttons
+            <li>radio buttons in wxToolBar
+        </ul>
+</ol>
 
 <P>
 
+<H4>Release 3.0.0 (stable)</H4>
+
+This release should finally mark the end of support for the antiquated
+compilers without decent support of the modern C++ features such as templates,
+exceptions and namespaces. wxWindows containers should be replaced with the
+corresponding standard library classes and <tt>std::basic_string&lt;&gt;</tt>
+should be used instead of <tt>wxString</tt>.
+
+<p>
+
 <CENTER>
 <HR> <FONT SIZE=+2><I><B><a name="todo">To-Do List</a></B></I></FONT> <HR>
 </CENTER>
 
 <P>
 
+This is just a collection of the various things which it would be nice to
+include in wxWindows but which are not actively worked on right now and for
+which no schedule is fixed yet. If you're interested in helping with wxWindows
+development, one of the small projects below could be a great way to join the
+team!
+
 Developers: please feel free to add to these, and delete them when they are done.
 
 <P>
 
-<B><I>Already done</I></B><P>
-
-<P>
-
-<ul>
-<li>wxHTML printing. When finished, this will allow an application to generate
-printed reports with very little effort.
-<li>Split library into several, for base (classes and functions usable by console and GUI
-applications), console (classes and functions usable by console application only)
-and GUI (classes and functions usable by GUI application only).
-<li>wxSocket.
-<li>wxImage handlers in separate .h and .cpp files.
-<li>PCX writing code.
-<li>Tidying of timer code, addition of wxStopWatch class.
-<li>wxDateTime class.
-<li>Rotated text support (might still be improved)
-<li>Bug tracking system.
-</ul>
-
 <B><I>General</I></B><P>
 
 <ul>
@@ -168,21 +130,6 @@ that can handle multiple formats).
 add constraint specification to WXR syntax and Dialog Editor; add multilanguage support to WXR.
 May be we'd better change the format completely and replace WXR with XML
 (providing conversion utility for old files)?
-<li>Context sensitive help: we need to have wxHelpEvent which would be
-generated when the help for a given control is requested and a standard
-handler for it in wxWindow which would invoke the default help system with the
-correct help id.
-<li>Rewrite Dialog Editor.
-<li>Modem-oriented classes: wxDialUpManager for dialing up the ISP and
-determining if there is a connection to Internet on the machine and
-wxPhoneDialer for dialing arbitrary phone numbers and otherwise communicating
-with the modem.
-<li>GIF animation code (support is already there, but wxAnimation is not yet complete)
-<li>Debug wxPostScriptDC further.
-<li>Regular expressions support.
-<li>Expansion of wxHTML to support further tags, and frames.
-<li>MGL port (see Backroom/Future Ports page).
-<li>FreeType support.
 <li>Support for 'skins', perhaps using a set of alternative control and window classes
 written generically in wxWindows.
 <li>Serial and parallel port support.
@@ -197,7 +144,6 @@ written generically in wxWindows.
 
 <ul>
 <li>Windows CE port.
-<li>Write a RC to WXR converter.
 </ul>
 
 <P>
@@ -210,16 +156,6 @@ written generically in wxWindows.
 
 <P>
 
-<B><I>wxMotif</I></B><P>
-
-<ul>
-<li>Fix menu accelerators
-<li>Fix refresh problems
-<li>Allow wxSystemSettings to be configurable, perhaps via a control
-panel application.
-</ul>
-
-
 </BODY>
 </HTML>