diff --git a/ChangeLog b/ChangeLog
index 40ff1883..0aa373cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-26  Eric Blake  <ebb9@byu.net>
+
+	Improve INSTALL formatting.
+	* doc/install.texi [!autoconf]: Ensure first paragraphs are
+	indented like all others in a plain text rendering.
+	* Makefile.am ($(srcdir)/INSTALL): Ensure plaintext formatting.
+	Reported by Bruno Haible.
+
 2008-08-26  Stepan Kasal  <skasal@redhat.com>
 
 	Check for case sensitive make.
diff --git a/Makefile.am b/Makefile.am
index 215c14be..bd4b1149 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,7 +41,7 @@ if MAKE_CASE_SENSITIVE
 
 MAINTAINERCLEANFILES = $(srcdir)/INSTALL
 $(srcdir)/INSTALL: $(top_srcdir)/doc/install.texi
-	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -o $@ \
+	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --plaintext -o $@ \
 	  $(top_srcdir)/doc/install.texi
 endif
 
diff --git a/doc/install.texi b/doc/install.texi
index f6620ec3..a344b289 100644
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -2,6 +2,7 @@
 @c the INSTALL file.
 
 @ifclear autoconf
+@firstparagraphindent insert
 
 @unnumbered Installation Instructions