diff --git a/ChangeLog b/ChangeLog
index fddb1c8a2..71837dd17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-28  Marius Vollmer  <marius.vollmer@uni-dortmund.de>
+
+	* configure.in: Removed code for --enable-htmldoc; support for
+	HTML is now included in automake.
+
 2004-06-16  Rob Browning  <rlb@defaultvalue.org>
 
 	* pre-inst-guile.in: modify to handle move of readline.scm to
diff --git a/NEWS b/NEWS
index c348cf295..3a3dfb024 100644
--- a/NEWS
+++ b/NEWS
@@ -128,6 +128,11 @@ This is an implementation of SRFI-31 which provides a special form
 We now use a modified version of libltdl that allows us to make
 improvements to it without having to rely on libtool releases.
 
+** The --enable-htmldoc option has been removed from 'configure'.
+
+Support for translating the documentation into HTML is now always
+provided.  Use 'make html'.
+
 * Changes to the stand-alone interpreter
 
 ** New command line option `--no-debug'.