diff --git a/Doc/api.tex b/Doc/api.tex
index 7d99848..fdc19b0 100644
--- a/Doc/api.tex
+++ b/Doc/api.tex
@@ -2906,6 +2906,6 @@
 XXX Explain Py_DEBUG, Py_TRACE_REFS, Py_REF_DEBUG.
 
 
-\inputindex{api.ind}			% Index -- must be last
+\input{api.ind}			% Index -- must be last
 
 \end{document}
diff --git a/Doc/api/api.tex b/Doc/api/api.tex
index 7d99848..fdc19b0 100644
--- a/Doc/api/api.tex
+++ b/Doc/api/api.tex
@@ -2906,6 +2906,6 @@
 XXX Explain Py_DEBUG, Py_TRACE_REFS, Py_REF_DEBUG.
 
 
-\inputindex{api.ind}			% Index -- must be last
+\input{api.ind}			% Index -- must be last
 
 \end{document}
diff --git a/Doc/ext.tex b/Doc/ext.tex
index d2d11ad..0532212 100644
--- a/Doc/ext.tex
+++ b/Doc/ext.tex
@@ -1489,6 +1489,6 @@
 files).  No \samp{-l} options can be used.
 
 
-\inputindex{ext.ind}
+\input{ext.ind}
 
 \end{document}
diff --git a/Doc/ext/ext.tex b/Doc/ext/ext.tex
index d2d11ad..0532212 100644
--- a/Doc/ext/ext.tex
+++ b/Doc/ext/ext.tex
@@ -1489,6 +1489,6 @@
 files).  No \samp{-l} options can be used.
 
 
-\inputindex{ext.ind}
+\input{ext.ind}
 
 \end{document}
diff --git a/Doc/lib.tex b/Doc/lib.tex
index ca587ce..1ac5992 100644
--- a/Doc/lib.tex
+++ b/Doc/lib.tex
@@ -223,12 +223,20 @@
 
 \input{libundoc}
 
-\renewcommand{\indexname}{Module Index}
-\renewcommand{\indexlabel}{modindex}
-\inputindex{modlib.ind}		% Module Index
+%
+%  The ugly "%begin{latexonly}" pseudo-environments are really just to
+%  keep LaTeX2HTML quiet during the \renewcommand{} macros; they're
+%  not really valuable.
+%
 
+%begin{latexonly}
+\renewcommand{\indexname}{Module Index}
+%end{latexonly}
+\input{modlib.ind}		% Module Index
+
+%begin{latexonly}
 \renewcommand{\indexname}{Index}
-\renewcommand{\indexlabel}{genindex}
-\inputindex{lib.ind}			% Index
+%end{latexonly}
+\input{lib.ind}			% Index
 
 \end{document}
diff --git a/Doc/lib/lib.tex b/Doc/lib/lib.tex
index ca587ce..1ac5992 100644
--- a/Doc/lib/lib.tex
+++ b/Doc/lib/lib.tex
@@ -223,12 +223,20 @@
 
 \input{libundoc}
 
-\renewcommand{\indexname}{Module Index}
-\renewcommand{\indexlabel}{modindex}
-\inputindex{modlib.ind}		% Module Index
+%
+%  The ugly "%begin{latexonly}" pseudo-environments are really just to
+%  keep LaTeX2HTML quiet during the \renewcommand{} macros; they're
+%  not really valuable.
+%
 
+%begin{latexonly}
+\renewcommand{\indexname}{Module Index}
+%end{latexonly}
+\input{modlib.ind}		% Module Index
+
+%begin{latexonly}
 \renewcommand{\indexname}{Index}
-\renewcommand{\indexlabel}{genindex}
-\inputindex{lib.ind}			% Index
+%end{latexonly}
+\input{lib.ind}			% Index
 
 \end{document}