diff --git a/TODO b/TODO
deleted file mode 100644
index 5504596..0000000
--- a/TODO
+++ /dev/null
@@ -1,58 +0,0 @@
-Upcoming versions and their release criteria.
-
-0.85
-====
-
-- NO MORE SYNTAX CHANGES!!!
-- Top-level function rules
-- Modifier rules
-
-0.86
-====
-
-- STABLE SYNTAX!!!
-- Smarty compat for foreach syntax (maybe with a special
-  flag for enabling?  ick)
-- Make opcode integers instead of strings
-- Calling display() on a template should not be part of the same cache
-  output as a currently running display; that is black magic; add a way
-	to execute a template inside the cache output of another, via Runtime
-
-0.87
-====
-
-- Object-oriented API for plugin functions, modifiers
-- Add Sugar_Chunk class instad of array for base execution unit
-
-0.90
-====
-
-- Thoroughly document syntax
-- Thoroughly document built-ins
-- Thoroughly document standard functions
-- Thoroughly document client API
-- Thoroughly document extension API
-
-0.99
-====
-
-- FINAL API ADDITIONS (NO API BREAKS!)
-
-1.0
-===
-
-- TESTING (CRITICAL FIXES ONLY)
-
-1.2
-===
-
-- Smarty compatibility mode
-
-2.0
-===
-
-- remove deprecated features
-- generate cacheable bytecode (if PHP allows it by then)
-  may need compilation to PHP, but only if we don't have to
-	keep the file around (because Smarty does this and it
-	breaks far, far too easily)
diff --git a/doc/index.rst b/doc/index.rst
index ec6e49d..5fffa37 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -16,11 +16,6 @@ Contents:
    api
    extend
    smarty
+   roadmap
+   news
    license
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
diff --git a/NEWS b/doc/news.rst
similarity index 81%
rename from NEWS
rename to doc/news.rst
index 950de5e..a6c9046 100644
--- a/NEWS
+++ b/doc/news.rst
@@ -1,10 +1,11 @@
-==================
-** Version 0.84 **
-==================
+Version History
+===============
 
-==================
-** Version 0.83 **
-==================
+Version 0.84
+------------
+
+Version 0.83
+------------
 
 + Include PEAR package.xml file.
 + Added uncache() and clearCache() methods.
@@ -18,17 +19,15 @@
 + pluginDir and templateDir may be arrays of paths.
 + section, insert, inherit all look like built-in functions.
 
-==================
-** Version 0.82 **
-==================
+Version 0.82
+------------
 
 + Registered functions can have escaping disabled by default.
 + Sections.
 + Layouts.
 
-==================
-** Version 0.81 **
-==================
+Version 0.81
+------------
 
 + Improved documentation.
 + Added modifiers.
@@ -37,9 +36,8 @@
 + Support Smarty-style block terminators (e.g. /if).
 + Method access control via $smarty->method_acl property.
 
-==================
-** Version 0.80 **
-==================
+Version 0.80
+------------
 
 + Added the ability to set functions as non-cachable back.
 + Added ability to change code delimiters.
@@ -51,9 +49,8 @@
 + Added plugin support for functions.
 + Cleaned up the stdlib naming slightly.
 
-==================
-** Version 0.74 **
-==================
+Version 0.74
+------------
 
 + Fix fetch*() family of functions.
 + More E_STRICT|E_ALL errors fixed.
@@ -63,25 +60,22 @@
 + Removed function flags.
 + Added gen-doc.php documentation generator.
 
-==================
-** Version 0.73 **
-==================
+Version 0.73
+------------
 
 + Fix isCached() in debug mode.
 + E_STRICT|E_ALL error fixed.
 + Fixed templates.
 
-==================
-** Version 0.72 **
-==================
+Version 0.72
+------------
 
 + Caching bug fixes.
 + New functions.
 + Include file timestamp checking for HTML caches.
 
-==================
-** Version 0.71 **
-==================
+Version 0.71
+------------
 
 + Removed the automatic conversion of names to strings
 + Massive cleanups to compiler
@@ -94,9 +88,8 @@
 + Complete API documentation in phpDocumentor format
 + Methods for retrieving template output
 
-==================
-** Version 0.70 **
-==================
+Version 0.70
+------------
 
 + Modified loop syntax
 + Added a while loop
diff --git a/doc/roadmap.rst b/doc/roadmap.rst
new file mode 100644
index 0000000..02eac0f
--- /dev/null
+++ b/doc/roadmap.rst
@@ -0,0 +1,61 @@
+Sugar Roadmap
+=============
+
+Version 1.0
+-----------
+
+Version 0.85
+~~~~~~~~~~~~
+
++ Top-level function rules
++ Modifier rules
+
+Version 0.86
+~~~~~~~~~~~~
+
++ NO MORE SYNTAX CHANGES!!!
++ Object-oriented API for plugin functions, modifiers
++ Add Sugar_Chunk class instad of array for base execution unit
+
+Version 0.90
+~~~~~~~~~~~~
+
++ Make opcode integers instead of strings
++ Calling display() on a template should not be part of the same cache
+  output as a currently running display; that is black magic; add a way
+  to execute a template inside the cache output of another, via Runtime
+
+Version 0.91
+~~~~~~~~~~~~
+
++ Thoroughly document syntax
++ Thoroughly document built-ins
++ Thoroughly document standard functions
++ Thoroughly document client API
++ Thoroughly document extension API
+
+Final 1.0
+~~~~~~~~~
+
++ Critical fixes only!
+
+Version 1.2
+-----------
+
++ Smarty compatibility mode ?
++ Custom blocks ?
++ Compiler function extensions ?
+
+Version 1.4
+-----------
+
++ Multi-level caching ?
+
+Version 2.0
+-----------
+
++ remove deprecated features
++ generate cacheable bytecode (if PHP allows it by then)
+  may need compilation to PHP, but only if we don't have to
+  keep the file around (because Smarty does this and it
+  breaks far, far too easily)