diff --git a/Lib/ConfigParser.py b/Lib/configparser.py
similarity index 100%
rename from Lib/ConfigParser.py
rename to Lib/configparser.py
diff --git a/Lib/lib-old/ConfigParser.py b/Lib/lib-old/ConfigParser.py
new file mode 100644
index 0000000..b686cc4
--- /dev/null
+++ b/Lib/lib-old/ConfigParser.py
@@ -0,0 +1,8 @@
+import sys
+from warnings import warnpy3k
+
+warnpy3k("the ConfigParser module has been renamed "
+         "to 'configparser' in Python 3.0", stacklevel=2)
+
+import configparser
+sys.modules[__name__] = configparser
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index 78dd53d..e622284 100644
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -203,7 +203,8 @@
 class TestStdlibRenames(unittest.TestCase):
 
     renames = {'copy_reg': 'copyreg', 'Queue': 'queue',
-               'SocketServer': 'socketserver'}
+               'SocketServer': 'socketserver',
+               'ConfigParser': 'configparser'}
 
     def check_rename(self, module_name, new_module_name):
         """Make sure that:
diff --git a/Misc/NEWS b/Misc/NEWS
index 71d34cd..ebcaeda 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,9 @@
 Library
 -------
 
+- The ConfigParser module has been renamed 'configparser'.  The old
+  name is now deprecated.
+
 - The CL, CL_old, and cl modules for IRIX have been deprecated for removal in
   Python 3.0.