diff --git a/ChangeLog b/ChangeLog
index 5e921945..04fe2368 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
 CVS code -
 - General:
 	- Miscellaneous comment fixes. (DLR)
-	- Don't install the nanorc manpages if nano is built without
-	  nanorc support.  Changes to configure.ac, doc/man/Makefile.am,
-	  and doc/man/fr/Makefile.am. (DLR)
+	- Don't install the nanorc manpages or generate their HTML
+	  versions if nano is built without nanorc support.  Changes to
+	  configure.ac, doc/man/Makefile.am, and doc/man/fr/Makefile.am.
+	  (DLR)
 - winio.c:
   do_credits()
 	- Update the last copyright notice to include 2006. (DLR)
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index d76d8646..dbae113a 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -6,13 +6,14 @@ endif
 
 if USE_NANORC
 man_MANS = nano.1 nanorc.5 rnano.1
+BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
 else
 man_MANS = nano.1 rnano.1
+BUILT_SOURCES = nano.1.html rnano.1.html
 endif
 
-nano_mans = nano.1 nanorc.5 rnano.1
-
-BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
+nano_man_mans = nano.1 nanorc.5 rnano.1
+nano_built_sources = nano.1.html nanorc.5.html rnano.1.html
 
 nano.1.html: nano.1
 	cat $< | groff -t -mandoc -Thtml > $@
@@ -21,4 +22,4 @@ nanorc.5.html: nanorc.5
 rnano.1.html: rnano.1
 	cat $< | groff -t -mandoc -Thtml > $@
 
-EXTRA_DIST = $(nano_mans) $(BUILT_SOURCES)
+EXTRA_DIST = $(nano_man_mans) $(nano_built_sources)
diff --git a/doc/man/fr/Makefile.am b/doc/man/fr/Makefile.am
index 5f295d8b..0b9165ce 100644
--- a/doc/man/fr/Makefile.am
+++ b/doc/man/fr/Makefile.am
@@ -2,13 +2,14 @@ mandir = @mandir@/fr
 
 if USE_NANORC
 man_MANS = nano.1 nanorc.5 rnano.1
+BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
 else
 man_MANS = nano.1 rnano.1
+BUILT_SOURCES = nano.1.html rnano.1.html
 endif
 
-nano_mans = nano.1 nanorc.5 rnano.1
-
-BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
+nano_man_mans = nano.1 nanorc.5 rnano.1
+nano_built_sources = nano.1.html nanorc.5.html rnano.1.html
 
 nano.1.html: nano.1
 	cat $< | groff -t -mandoc -Thtml > $@
@@ -17,4 +18,4 @@ nanorc.5.html: nanorc.5
 rnano.1.html: rnano.1
 	cat $< | groff -t -mandoc -Thtml > $@
 
-EXTRA_DIST = $(nano_mans) $(BUILT_SOURCES)
+EXTRA_DIST = $(nano_man_mans) $(nano_built_sources)