diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst
index e24b429..9df72e3 100644
--- a/Doc/library/socketserver.rst
+++ b/Doc/library/socketserver.rst
@@ -4,6 +4,8 @@
 
 .. module:: socketserver
    :synopsis: A framework for network servers.
+.. versionadded:: 2.6
+
 
 The :mod:`socketserver` module simplifies the task of writing network servers.
 
diff --git a/Doc/library/socketserver_old.rst b/Doc/library/socketserver_old.rst
new file mode 100644
index 0000000..a6f564e
--- /dev/null
+++ b/Doc/library/socketserver_old.rst
@@ -0,0 +1,8 @@
+:mod:`SocketServer` --- A framework for network servers
+=======================================================
+
+.. module:: SocketServer
+   :synopsis: A framework for network servers.
+
+The :mod:`SocketServer` module has been renamed to :mod:`socketserver`
+in Python 3.0.  The old name is now deprecated.