diff --git a/Doc/library/compiler.rst b/Doc/library/compiler.rst
index fd5fd6c34ee..7aac3b8042e 100644
--- a/Doc/library/compiler.rst
+++ b/Doc/library/compiler.rst
@@ -5,6 +5,9 @@
 Python compiler package
 ***********************
 
+.. deprecated:: 2.6
+   The compiler package has been removed in Python 3.0.
+
 .. sectionauthor:: Jeremy Hylton <jeremy@zope.com>
 
 
@@ -34,6 +37,7 @@ The basic interface
 
 .. module:: compiler
    :synopsis: Python code compiler written in Python.
+   :deprecated:
 
 
 The top-level of the package defines four functions.  If you import
diff --git a/Lib/compiler/__init__.py b/Lib/compiler/__init__.py
index ce89144b733..d75140aa722 100644
--- a/Lib/compiler/__init__.py
+++ b/Lib/compiler/__init__.py
@@ -20,6 +20,9 @@ compile(source, filename, mode, flags=None, dont_inherit=None)
 compileFile(filename)
     Generates a .pyc file by compiling filename.
 """
+from warnings import warnpy3k
+warnpy3k("the compiler package has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
 
 from compiler.transformer import parse, parseFile
 from compiler.visitor import walk
diff --git a/Lib/test/test_compiler.py b/Lib/test/test_compiler.py
index d491b780961..390c4697ee3 100644
--- a/Lib/test/test_compiler.py
+++ b/Lib/test/test_compiler.py
@@ -1,7 +1,7 @@
-import compiler
+import test.test_support
+compiler = test.test_support.import_module('compiler', deprecated=True)
 from compiler.ast import flatten
 import os, sys, time, unittest
-import test.test_support
 from random import random
 from StringIO import StringIO
 
diff --git a/Misc/NEWS b/Misc/NEWS
index 6b93568807e..2aa7576aa6a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -23,6 +23,8 @@ Extension Modules
 Library
 -------
 
+- The compiler package has been deprecated for removal in Python 3.0.
+
 - The Bastion and rexec modules have been deprecated for removal in Python 3.0.
 
 - The bsddb185 module has been deprecated for removal in Python 3.0.