diff --git a/configure.ac b/configure.ac
index e0017559..f1950857 100644
--- a/configure.ac
+++ b/configure.ac
@@ -733,10 +733,6 @@ else
 fi
 AM_CONDITIONAL(GROFF_HTML, test x$groff_html_support = xyes)
 
-# Check for the availability of makeinfo.
-AC_CHECK_PROG(haveit, makeinfo, yes, no)
-AM_CONDITIONAL(HAVE_MAKEINFO, test x$haveit = xyes)
-
 # Check whether this is a git repository.
 AC_MSG_CHECKING([whether building from git])
 if test -d .git ; then
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1cbb3139..13227a70 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -25,11 +25,9 @@ endif
 
 info_TEXINFOS = nano.texi
 
-if HAVE_MAKEINFO
 BUILT_SOURCES += nano.html
-endif
+dist_html_DATA += nano.html
 
-nano.html: nano.texi
-	makeinfo --no-split --html < $< > $@
+AM_MAKEINFOHTMLFLAGS = --no-split
 
 EXTRA_DIST = $(BUILT_SOURCES) $(info_TEXINFOS)