diff --git a/Doc/texinputs/howto.cls b/Doc/texinputs/howto.cls
index 901cf8700f1..f2c1ecd9d20 100644
--- a/Doc/texinputs/howto.cls
+++ b/Doc/texinputs/howto.cls
@@ -82,6 +82,17 @@
   \@doing@page@targetstrue
 }  
 
+% Fix the theindex environment to add an entry to the Table of
+% Contents; this is much nicer than just having to jump to the end of
+% the book and flip around, especially with multiple indexes.
+%
+\let\OldTheindex=\theindex
+\renewcommand{\theindex}{
+  \clearpage
+  \OldTheindex
+  \addcontentsline{toc}{section}{\indexname}
+}
+
 \@ifundefined{fancyhf}{
   \pagestyle{plain}}{
   \pagestyle{normal}}		% start this way; change for
diff --git a/Doc/texinputs/manual.cls b/Doc/texinputs/manual.cls
index c7ab75ed16e..d48923e90c4 100644
--- a/Doc/texinputs/manual.cls
+++ b/Doc/texinputs/manual.cls
@@ -122,3 +122,15 @@
   \@ifundefined{fancyhf}{}{\pagestyle{normal}}%
   \@doing@page@targetstrue%
 }
+
+
+% Fix the theindex environment to add an entry to the Table of
+% Contents; this is much nicer than just having to jump to the end of
+% the book and flip around, especially with multiple indexes.
+%
+\let\OldTheindex=\theindex
+\renewcommand{\theindex}{
+  \cleardoublepage
+  \OldTheindex
+  \addcontentsline{toc}{chapter}{\indexname}
+}
diff --git a/Doc/texinputs/python.sty b/Doc/texinputs/python.sty
index 831143f6322..d98c4b1ef93 100644
--- a/Doc/texinputs/python.sty
+++ b/Doc/texinputs/python.sty
@@ -286,17 +286,6 @@
 \newif\if@UseModuleIndex
 \@UseModuleIndexfalse
 
-% Fix the theindex environment to add an entry to the Table of
-% Contents; this is much nicer than just having to jump to the end of
-% the book and flip around, especially with multiple indexes.
-%
-\let\OldTheindex=\theindex
-\renewcommand{\theindex}{
-  \cleardoublepage
-  \OldTheindex
-  \addcontentsline{toc}{chapter}{\indexname}
-}
-
 \newcommand{\makemodindex}{
   \newwrite\modindexfile
   \openout\modindexfile=mod\jobname.idx