diff --git a/doc/Makefile.in b/doc/Makefile.in
index 40e40ce..1a5dcc1 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -35,7 +35,21 @@ address@hidden@
 address@hidden@
 address@hidden@
 DESTDIR=
address@hidden@
+# If `texi2html' is not available, use `makeinfo' when possible.  Set the ToC
+# file accordingly.  Actually, makeinfo > 5 is needed, but we don't check the
+# version.
+ifneq (@TEXI2HTML@,:)
+	address@hidden@
+	TEXI2HTML_TOC=auctex_toc.html
+else
+	ifneq (@MAKEINFO@,:)
+		address@hidden@ --html
+		TEXI2HTML_TOC=index.html
+	else
+		address@hidden@
+		TEXI2HTML_TOC=auctex_toc.html
+	endif
+endif
 address@hidden@
 address@hidden@
 MKINSTALLDIRS = ../mkinstalldirs
@@ -73,17 +87,17 @@ install-man:
 
 dist: $(DISTTEXTS) preview-latex.info auctex.info tex-ref.pdf
 
-extradist: html/auctex_toc.html auctex.ps auctex.pdf tex-ref.ps tex-ref.pdf
+extradist: html/$(TEXI2HTML_TOC) auctex.ps auctex.pdf tex-ref.ps tex-ref.pdf
 
 .PHONY: all info dvi dist install-auctex disttexts clean distclean \
 	maintainer-clean install-preview install-man html-docs extradist
 
 # AUCTeX
 
-html/auctex_toc.html: auctex.texi
+html/$(TEXI2HTML_TOC): auctex.texi
 	rm -rf html
 	mkdir html
-	cd html && $(TEXI2HTML) -split_node -I .. ../auctex.texi && \
+	cd html && $(TEXI2HTML) --split=node -I .. ../auctex.texi && \
 	test ! -d auctex || { mv auctex/* . && rm -rf auctex ; }
 
 tex-ref.dvi: tex-ref.tex