diff --git a/Lib/multifile.py b/Lib/multifile.py
index e82a3fd..35b0200 100644
--- a/Lib/multifile.py
+++ b/Lib/multifile.py
@@ -26,6 +26,10 @@
 current file part.  This may be useful when using MultiFile with a non-
 seekable stream object.
 """
+from warnings import warn
+warn("the multifile module has been deprecated since Python 2.5",
+        DeprecationWarning, stacklevel=2)
+del warn
 
 __all__ = ["MultiFile","Error"]
 
diff --git a/Lib/test/test_multifile.py b/Lib/test/test_multifile.py
index 437c394..daf7dde 100644
--- a/Lib/test/test_multifile.py
+++ b/Lib/test/test_multifile.py
@@ -1,5 +1,6 @@
+from test import test_support
 import mimetools
-import multifile
+multifile = test_support.import_module('multifile', deprecated=True)
 import cStringIO
 
 msg = """Mime-Version: 1.0