diff --git a/Lib/lib-old/SocketServer.py b/Lib/lib-old/SocketServer.py
new file mode 100644
index 0000000..9875894
--- /dev/null
+++ b/Lib/lib-old/SocketServer.py
@@ -0,0 +1,8 @@
+import sys
+from warnings import warnpy3k
+
+warnpy3k("the SocketServer module has been renamed "
+         "to 'socketserver' in Python 3.0", stacklevel=2)
+
+import socketserver
+sys.modules[__name__] = socketserver
diff --git a/Lib/SocketServer.py b/Lib/socketserver.py
similarity index 100%
rename from Lib/SocketServer.py
rename to Lib/socketserver.py
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index a4c24d4..ef4d0b9 100644
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -182,7 +182,8 @@
 
 class TestStdlibRenames(unittest.TestCase):
 
-    renames = {'copy_reg': 'copyreg', 'Queue': 'queue'}
+    renames = {'copy_reg': 'copyreg', 'Queue': 'queue',
+               'SocketServer': 'socketserver'}
 
     def check_rename(self, module_name, new_module_name):
         """Make sure that:
diff --git a/Misc/NEWS b/Misc/NEWS
index 7384c9d..a15ebb4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -26,6 +26,9 @@
 Library
 -------
 
+- The SocketServer module has been renamed 'socketserver'.  The old
+  name is now deprecated.
+
 - The imageop module has been deprecated for removal in Python 3.0.
 
 - #2250: Exceptions raised during evaluation of names in rlcompleter's