diff --git a/Doc/library/undoc.rst b/Doc/library/undoc.rst
index 62efc1842df..856cf860632 100644
--- a/Doc/library/undoc.rst
+++ b/Doc/library/undoc.rst
@@ -61,6 +61,9 @@ Multimedia
    or demo.  Requires the external program :program:`sox`.
 
 
+   .. warning:: The :mod:`toaiff` module has been removed in 3.0.
+
+
 .. _undoc-mac-modules:
 
 Undocumented Mac OS modules
diff --git a/Lib/toaiff.py b/Lib/toaiff.py
index 3c8a02ba726..3a2b80cbe38 100644
--- a/Lib/toaiff.py
+++ b/Lib/toaiff.py
@@ -7,6 +7,9 @@
 in the latter case the caller must ensure that it is removed.
 Other temporary files used are removed by the function.
 """
+from warnings import warnpy3k
+warnpy3k("the toaiff module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
 
 import os
 import tempfile
diff --git a/Misc/NEWS b/Misc/NEWS
index 82af109a44e..58fd955bf51 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -20,6 +20,8 @@ Extension Modules
 Library
 -------
 
+- The toaiff module has been deprecated for removal in Python 3.0.
+
 - The test.testall module has been deprecated for removal in Python 3.0.
 
 - The new module has been deprecated for removal in Python 3.0.