diff --git a/doc/source/conf.py b/doc/source/conf.py
index 388900b..3708400 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -120,7 +120,7 @@ latex_font_size = '10pt'
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, document class [howto/manual]).
-latex_documents = [('ipython','ipython.tex','IPython Documentation','Fernando Perez','manual')]
+latex_documents = [('ipython','ipython.tex','IPython Documentation','Fernando Perez (and contributors)','manual')]
 
 # Additional stuff for the LaTeX preamble.
 #latex_preamble = ''
diff --git a/doc/source/ipython.rst b/doc/source/ipython.rst
index 4cbb7de..b34cf00 100644
--- a/doc/source/ipython.rst
+++ b/doc/source/ipython.rst
@@ -17,6 +17,21 @@ Indices and tables
 * :ref:`modindex`
 * :ref:`search`
 
+Introduction
+============
+
+This is the official documentation for IPython 0.x series (i.e. what
+we are used to refer to just as "IPython"). The original text of the
+manual (most of which is still in place) has been authored by Fernando
+Perez, but as recommended usage patterns and new features have
+emerged, this manual has been updated to reflect that fact. Most of
+the additions have been authored by Ville M. Vainio.
+
+The manual has been generated from reStructuredText source markup with
+Sphinx, which should make it much easier to keep it up-to-date in the
+future. Some reST artifacts and bugs may still be apparent in the
+documentation, but this should improve as the toolchain matures.
+
 Overview
 ========
 
@@ -181,7 +196,7 @@ Windows 9x support is present, and has been reported to work fine (at
 least on WinME).
 
 Location
-========
+--------
 
 IPython is generously hosted at http://ipython.scipy.org by the
 Enthought, Inc and the SciPy project. This site offers downloads,