diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index a24c03ead3..bcab3865ee 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -69,7 +69,7 @@ INSTALL_DATA =
 # The makeinfo program is part of the Texinfo distribution.
 # Use --force so that it generates output even if there are errors.
 MAKEINFO = @MAKEINFO@
-MAKEINFO_OPTS = --force --enable-encoding -I $(srcdir)
+MAKEINFO_OPTS = --no-split --fill-column=72 --no-split --fill-column=72 --force --enable-encoding -I $(srcdir)

 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index 42e6d2c1c8..34ec411f8c 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -51,7 +51,7 @@ INSTALL =
 INSTALL_DATA = @INSTALL_DATA@

 MAKEINFO = @MAKEINFO@
-MAKEINFO_OPTS = --force -I $(emacsdir) -I $(srcdir)
+MAKEINFO_OPTS = --no-split --fill-column=72 --no-split --fill-column=72 --force -I $(emacsdir) -I $(srcdir)
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
 DVIPS = dvips
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index 8a61adf232..3f762adfdf 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -55,7 +55,7 @@ INSTALL =
 INSTALL_DATA = @INSTALL_DATA@

 MAKEINFO = @MAKEINFO@
-MAKEINFO_OPTS = --force --enable-encoding -I $(emacsdir) -I $(srcdir)
+MAKEINFO_OPTS = --no-split --fill-column=72 --no-split --fill-column=72 --force --enable-encoding -I $(emacsdir) -I $(srcdir)
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
 DVIPS = dvips
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index b6eef7ea79..7b11d972de 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -61,7 +61,7 @@ INSTALL_DATA =
 # Use --force so that it generates output even if there are errors.
 # (TODO?  Why is this appropriate?)
 MAKEINFO = @MAKEINFO@
-MAKEINFO_OPTS = --force -I$(emacsdir)
+MAKEINFO_OPTS = --no-split --fill-column=72 --no-split --fill-column=72 --force -I$(emacsdir)

 ## On MS Windows, efaq-w32; otherwise blank.
 DOCMISC_W32 = @DOCMISC_W32@