diff --git a/Doc/library/rfc822.rst b/Doc/library/rfc822.rst
index 37fef78..4c938f5 100644
--- a/Doc/library/rfc822.rst
+++ b/Doc/library/rfc822.rst
@@ -9,7 +9,8 @@
 
 .. deprecated:: 2.3
    The :mod:`email` package should be used in preference to the :mod:`rfc822`
-   module.  This module is present only to maintain backward compatibility.
+   module.  This module is present only to maintain backward compatibility, and
+   has been removed in 3.0.
 
 This module defines a class, :class:`Message`, which represents an "email
 message" as defined by the Internet standard :rfc:`2822`. [#]_  Such messages
diff --git a/Lib/rfc822.py b/Lib/rfc822.py
index 14cc729..4382a51 100644
--- a/Lib/rfc822.py
+++ b/Lib/rfc822.py
@@ -73,6 +73,9 @@
 
 import time
 
+from warnings import warnpy3k
+warnpy3k("in 3.x, rfc822 has been removed in favor of the email package")
+
 __all__ = ["Message","AddressList","parsedate","parsedate_tz","mktime_tz"]
 
 _blanklines = ('\r\n', '\n')            # Optimization for islast()
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index b2dc8cd..a289cc7 100644
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -198,7 +198,7 @@
     # import side-effect.
     all_platforms = ('audiodev', 'imputil', 'mutex', 'user', 'new', 'rexec',
                         'Bastion', 'compiler', 'dircache', 'mimetools', 'fpformat',
-                        'ihooks', 'mhlib', 'statvfs', 'htmllib', 'sgmllib')
+                        'ihooks', 'mhlib', 'statvfs', 'htmllib', 'sgmllib', 'rfc822')
     inclusive_platforms = {'irix' : ('pure', 'AL', 'al', 'CD', 'cd', 'cddb',
                                      'cdplayer', 'CL', 'cl', 'DEVICE', 'GL',
                                      'gl', 'ERRNO', 'FILE', 'FL', 'flp', 'fl',
diff --git a/Lib/test/test_rfc822.py b/Lib/test/test_rfc822.py
index 197887d..afbc984 100644
--- a/Lib/test/test_rfc822.py
+++ b/Lib/test/test_rfc822.py
@@ -1,7 +1,8 @@
-import rfc822
 import unittest
 from test import test_support
 
+rfc822 = test_support.import_module("rfc822", deprecated=True)
+
 try:
     from cStringIO import StringIO
 except ImportError:
diff --git a/Misc/NEWS b/Misc/NEWS
index 5bd09de..2481de3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -84,6 +84,8 @@
 Library
 -------
 
+- The rfc822 module has been deprecated for removal in 3.0.
+
 - The mimetools module has been deprecated for removal in 3.0.
 
 - The ctypes.byref function now takes an optional second parameter