diff --git a/Lib/MimeWriter.py b/Lib/MimeWriter.py
index 58c0a0bcf2a..e898f9ff231 100644
--- a/Lib/MimeWriter.py
+++ b/Lib/MimeWriter.py
@@ -14,6 +14,11 @@
 
 __all__ = ["MimeWriter"]
 
+import warnings
+
+warnings.warn("the MimeWriter module is deprecated; use the email package instead",
+                DeprecationWarning, 2)
+
 class MimeWriter:
 
     """Generic MIME writer.
diff --git a/Lib/test/test_MimeWriter.py b/Lib/test/test_MimeWriter.py
index feca1631f2b..5a20bf226b8 100644
--- a/Lib/test/test_MimeWriter.py
+++ b/Lib/test/test_MimeWriter.py
@@ -10,6 +10,10 @@
 import unittest, sys, StringIO
 from test.test_support import run_unittest
 
+import warnings
+warnings.filterwarnings("ignore", "the MimeWriter module is deprecated.*",
+                        DeprecationWarning)
+
 from MimeWriter import MimeWriter
 
 SELLER = '''\
diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
index 14795a6e603..071ed04251f 100644
--- a/Lib/test/test___all__.py
+++ b/Lib/test/test___all__.py
@@ -7,6 +7,8 @@
                         DeprecationWarning, "<string>")
 warnings.filterwarnings("ignore", ".*popen2 module is deprecated.*",
                         DeprecationWarning)
+warnings.filterwarnings("ignore", "the MimeWriter module is deprecated.*",
+                        DeprecationWarning)
 
 class AllTest(unittest.TestCase):
 
diff --git a/Misc/NEWS b/Misc/NEWS
index 1ce32ceb0fc..4ca7fa8da2a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -220,6 +220,8 @@ Core and builtins
 Library
 -------
 
+- MimeWriter now raises a DeprecationWarning upon import.
+
 - tarfile.py: Improved unicode support. Unicode input names are now
   officially supported. Added "errors" argument to the TarFile class.