diff --git a/ChangeLog b/ChangeLog
index 8aa994e77945603d5f5894a58b8de4cb612aea6f..01ec3296db518059ab25310ab9ae41d304c8f105 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -136,6 +136,10 @@ CVS code -
   do_yesno()
 	- Make mouse clicks on the Yes/No/All shortcuts work properly
 	  when the MORE_SPACE flag is set. (DLR)
+- README.CVS:
+	- Mention that the minimum required version of texinfo is 4.0,
+	  since that's the first version that supports generating HTML.
+	  (DLR)
 - doc/nano.texi:
 	- Fix inconsistent wording and punctuation. (DLR)
 	- Add missing configure options. (Mike Frysinger, minor tweaks
@@ -145,6 +149,9 @@ CVS code -
 - doc/nanorc.sample:
 	- Tweak the "c-file" regex for characters to properly accept
 	  '\"' and reject '"' and '''. (DLR)
+- doc/texinfo/Makefile.am:
+	- Automatically generate an HTML version of the info page,
+	  nano.html. (DLR)
 - src/Makefile.am:
 	- Add browser.c, help.c, and prompt.c to nano_SOURCES. (DLR)
 
diff --git a/README.CVS b/README.CVS
index 4252f6663e0d0bf969b5d6d86d0d3095b89fb31e..0d28589ee15184315d5acc0419d7169504d9d2f1 100644
--- a/README.CVS
+++ b/README.CVS
@@ -11,7 +11,7 @@ packages:
 - automake (version >= 1.7)
 - gettext (version >= 0.11.5)
 - groff
-- texinfo
+- texinfo (version >= 4.0)
 - cvs
 - ssh (with support for the SSH version 2 protocol)
 - glib 2.x (if your system doesn't have vsnprintf())
diff --git a/doc/texinfo/Makefile.am b/doc/texinfo/Makefile.am
index 326772081bc68db16693f41d513d2de6b3068dcd..895967e3a83d94f3fb609bb96b7e1e87a5d18e7e 100644
--- a/doc/texinfo/Makefile.am
+++ b/doc/texinfo/Makefile.am
@@ -2,4 +2,9 @@ info_TEXINFOS = nano.texi
 
 MAKEINFO = makeinfo --no-split
 
-EXTRA_DIST = nano.info
+BUILT_SOURCES = nano.html
+
+nano.html: nano.texi
+	cat $< | makeinfo --no-split --html > $@
+
+EXTRA_DIST = $(info_TEXINFOS) $(BUILT_SOURCES)