diff --git a/Misc/NEWS b/Misc/NEWS
index 437bcbe..84ef777 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,8 +12,6 @@
 Core and Builtins
 -----------------
 
-- Removed the already-defunct ``-t`` option.
-
 - Issue #2957: Corrected a ValueError "recursion limit exceeded", when
   unmarshalling many code objects, which happens when importing a
   large .pyc file (~1000 functions).
diff --git a/Misc/build.sh b/Misc/build.sh
index efbad56..0c8d4d5 100755
--- a/Misc/build.sh
+++ b/Misc/build.sh
@@ -59,7 +59,7 @@
 PYTHON=$INSTALL_DIR/bin/python
 
 # Python options and regression test program that should always be run.
-REGRTEST_ARGS="-E $INSTALL_DIR/lib/python3.0/test/regrtest.py"
+REGRTEST_ARGS="-E -tt $INSTALL_DIR/lib/python3.0/test/regrtest.py"
 
 REFLOG="build/reflog.txt.out"
 # These tests are not stable and falsely report leaks sometimes.
diff --git a/Misc/cheatsheet b/Misc/cheatsheet
index 50ffc22..21b3d98 100644
--- a/Misc/cheatsheet
+++ b/Misc/cheatsheet
@@ -46,6 +46,7 @@
 -OO     remove doc-strings in addition to the -O optimizations
 -Q arg  division options: -Qold (default), -Qwarn, -Qwarnall, -Qnew
 -S      Don't perform 'import site' on initialization
+-t      Issue warnings about inconsistent tab usage (-tt: issue errors)
 -u      Unbuffered binary stdout and stderr (also PYTHONUNBUFFERED=x).
 -v      Verbose (trace import statements) (also PYTHONVERBOSE=x)
 -W arg : warning control (arg is action:message:category:module:lineno)
diff --git a/Misc/python.man b/Misc/python.man
index 3399a95..42f0123 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -35,6 +35,9 @@
 .B \-S
 ]
 [
+.B \-t
+]
+[
 .B \-u
 ]
 .br
@@ -141,6 +144,11 @@
 .I sys.path
 that it entails.
 .TP
+.B \-t
+Issue a warning when a source file mixes tabs and spaces for
+indentation in a way that makes it depend on the worth of a tab
+expressed in spaces.  Issue an error when the option is given twice.
+.TP
 .B \-u
 Force stdin, stdout and stderr to be totally unbuffered.  On systems
 where it matters, also put stdin, stdout and stderr in binary mode.
diff --git a/Misc/valgrind-python.supp b/Misc/valgrind-python.supp
index 7fb8dc7..a08eaac 100644
--- a/Misc/valgrind-python.supp
+++ b/Misc/valgrind-python.supp
@@ -5,7 +5,7 @@
 #
 #	cd python/dist/src
 #	valgrind --tool=memcheck --suppressions=Misc/valgrind-python.supp \
-#		./python -E ./Lib/test/regrtest.py -u bsddb,network
+#		./python -E -tt ./Lib/test/regrtest.py -u bsddb,network
 #
 # You must edit Objects/obmalloc.c and uncomment Py_USING_MEMORY_DEBUGGER
 # to use the preferred suppressions with Py_ADDRESS_IN_RANGE.