diff --git a/ChangeLog b/ChangeLog
index 0696670..3ab2a2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Mar 14 20:13:54 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* doc/Makefile.am configure.in: yearke@eng.buffalo.edu suggested
+	  a fix for --with-html-dir= configure support. I hope it won't
+	  break rpm generation
+
 Wed Mar 14 17:28:49 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* xmlIO.c: one function comment cleanup.
diff --git a/configure.in b/configure.in
index c0ea92b..21ac9bc 100644
--- a/configure.in
+++ b/configure.in
@@ -80,7 +80,7 @@
 
 dnl Specific dir for HTML output ?
 if test "x$with_html_dir" = "x" ; then
-  HTML_DIR='${datadir}/gtk-doc/html'
+  HTML_DIR='$(prefix)/doc'
 else
   HTML_DIR=$with_html_dir
 fi
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 89088c4..7feec35 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -9,7 +9,7 @@
 # The directory containing the source code (if it contains documentation).
 DOC_SOURCE_DIR=..
 
-HTML_DIR=$(prefix)/doc
+HTML_DIR=@HTML_DIR@
 
 TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)/html