diff --git a/ChangeLog b/ChangeLog
index 7a9c75957..933031164 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-09  Neil Jerram  <neil@ossau.uklinux.net>
+
+	* configure.in (htmldoc): Merge handling of `--enable-htmldoc'
+	option from guile-doc/configure.in.
+
 2001-03-06  Dirk Herrmann  <D.Herrmann@tu-bs.de>
 
 	* libguile.h: Removed #include "libguile/dump.h".
diff --git a/configure.in b/configure.in
index 5705f5b01..da45ecb20 100644
--- a/configure.in
+++ b/configure.in
@@ -74,6 +74,28 @@ AC_ARG_ENABLE(regex,
   [  --disable-regex         omit regular expression interfaces],,
   enable_regex=yes)
 
+AC_ARG_ENABLE(htmldoc,
+  [  --enable-htmldoc        build HTML documentation as well as Info],
+  [if test "$enable_htmldoc" = "" || test "$enable_htmldoc" = y || test "$enable_htmldoc" = yes; then
+     htmldoc_enabled=yes
+     AC_PATH_PROG(TEXI2HTML, texi2html, not found)
+     if test "$TEXI2HTML" = "not found"; then
+       echo
+       echo Building HTML documentation requires the \`texi2html\' program,
+       echo which appears not to be present on your machine.
+       echo
+       echo \`texi2html\' is available from
+       echo 'http://www.mathematik.uni-kl.de/~obachman/Texi2html/.'
+       echo
+       echo In the meantime, to build the guile-doc distribution
+       echo without HTML enabled, please rerun \`./configure\' without
+       echo the \`--enable-htmldoc\' option.
+       exit -1
+     fi
+   fi])
+
+AM_CONDITIONAL(HTMLDOC, test x$htmldoc_enabled = xyes)
+
 dnl The --disable-debug used to control these two.  But now they are
 dnl a required part of the distribution.
 AC_DEFINE(DEBUG_EXTENSIONS)
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 315fa2f36..c06be02fa 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,8 @@
 2001-03-09  Neil Jerram  <neil@ossau.uklinux.net>
 
+	* Makefile.am: Change HTML to HTMLDOC, now that we're part of a
+	wider distribution.
+
 	Moving documentation files from guile-doc and guile-doc into
 	guile-core/doc:
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8641100cc..738fe2b60 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -37,7 +37,7 @@ goops_TEXINFOS = goops-tutorial.texi hierarchy.eps hierarchy.txt
 
 # Optionally support building an HTML version of the reference manual.
 
-if HTML
+if HTMLDOC
 
 htmldir = $(prefix)/html/guile-$(VERSION)