diff --git a/ChangeLog b/ChangeLog
index 5a153d907..a8b6f0f54 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-04-20  Rob Browning  <rlb@defaultvalue.org>
 
 	* configure.in: add --fno-strict-aliasing when compiling with gcc.
diff --git a/NEWS b/NEWS
index b0583a389..861e531ab 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,11 @@ See the Guile info pages for more documentation.
 
 ** Guile is now compiled with -fno-strict-aliasing when gcc is detected.
 
+** 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
 
 ** GC bug fixed.
diff --git a/doc/goops/ChangeLog b/doc/goops/ChangeLog
index 36a6d1c3c..8a6da8918 100644
--- a/doc/goops/ChangeLog
+++ b/doc/goops/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-28  Marius Vollmer  <marius.vollmer@uni-dortmund.de>
+
+	* Makefile.am: Removed home-grown code for HTML generation.
+	Automake does it for us now.
+	(goops_TEXINFOS): Added hierarchy.png
+
+	* hierarchy.png: New file.
+
 2003-04-17  Mikael Djurfeldt  <djurfeldt@nada.kth.se>
 
 	* goops.texi (Object Comparisons): Removed object-eqv? and