--- Doc/Makefile.in
+++ Doc/Makefile.in
@@ -40,7 +40,7 @@
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
 DVIPS = dvips
-TEXI2HTML = @TEXI2HTML@ --output . --ifinfo --split=chapter --node-files
+TEXI2HTML = @TEXI2HTML@ --output . --split=chapter --node-files
 
 .SUFFIXES: .yo .1
 
@@ -294,26 +294,9 @@
 # install info pages, creating install directory if necessary
 install.info: texi
 	${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(infodir)
-	rm -rf infodir
-	mkdir infodir
-	if ( \
-	    sed '/^@setfilename/s|zsh|$(tzsh)|' \
-		< $(sdir)/zsh.texi > infodir/tzsh.texi && \
-	    (cd infodir && $(MAKEINFO) tzsh.texi) && \
-	    for file in infodir/$(tzsh).info*; do \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(infodir) || exit 1; \
-	    done \
-	); then \
-	    if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-	      install-info --info-dir=$(DESTDIR)$(infodir) \
-	        $(DESTDIR)$(infodir)/$(tzsh).info; \
-	    else true; fi; \
-	    rm -rf infodir; \
-	    exit 0; \
-	else \
-	    rm -rf infodir; \
-	    exit 1; \
-	fi
+	for file in zsh.info*; do \
+	    $(INSTALL_DATA) $$file $(DESTDIR)$(infodir) || exit 1; \
+	done
 .PHONY: install.info
 
 # uninstall man pages
@@ -332,7 +315,7 @@
 # install HTML manual
 install.html: html
 	${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(htmldir)
-	for file in *.html; do \
+	for file in zsh*.html; do \
 	    $(INSTALL_DATA) $$file $(DESTDIR)$(htmldir) || exit 1; \
 	done
 .PHONY: install.html