diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
index fe811de..6a4e049 100644
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -1,6 +1,9 @@
 :mod:`configparser` --- Configuration file parser
 =================================================
 
+.. module:: ConfigParser
+   :synopsis: Old name for the configparser module.
+
 .. module:: configparser
    :synopsis: Configuration file parser.
 
@@ -9,6 +12,11 @@
 .. moduleauthor:: Eric S. Raymond <esr@thyrsus.com>
 .. sectionauthor:: Christopher G. Petrilli <petrilli@amber.org>
 
+.. note::
+   The :mod:`ConfigParser` module has been renamed to :mod:`configparser` in
+   Python 3.0.  It is importable under both names in Python 2.6 and the rest of
+   the 2.x series.
+
 .. index::
    pair: .ini; file
    pair: configuration; file