diff --git a/configure.ac b/configure.ac
index 179f4a92..9e2a7504 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,15 +105,6 @@ AC_ARG_WITH(history,
 [  --with-history          add history support to xmllint shell(off)])
 AC_ARG_WITH(html,
 [  --with-html             add the HTML support (on)])
-dnl Specific dir for HTML output ?
-AC_ARG_WITH(html-dir, AS_HELP_STRING([--with-html-dir=path],
-            [path to base html directory, default $docdir/html]),
-            [HTML_DIR=$withval], [HTML_DIR='$(docdir)/html'])
-
-AC_ARG_WITH(html-subdir, AS_HELP_STRING([--with-html-subdir=path],
-            [directory used under html-dir, default '']),
-            [test "x$withval" != "x" && HTML_DIR="$HTML_DIR/$withval"])
-AC_SUBST(HTML_DIR)
 AC_ARG_WITH(http,
 [  --with-http             add the HTTP support (on)])
 AC_ARG_WITH(iconv,
@@ -1476,7 +1467,6 @@ AC_SUBST(XML_LIBTOOLLIBS)
 AC_SUBST(ICONV_LIBS)
 AC_SUBST(ICU_LIBS)
 AC_SUBST(XML_INCLUDEDIR)
-AC_SUBST(HTML_DIR)
 
 AC_SUBST(M_LIBS)
 AC_SUBST(RDL_LIBS)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0205974f..cbb89bdc 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -98,14 +98,14 @@ check-extra-dist:
 	rm -f tmp.EXTRA_DIST_wc tmp.EXTRA_DIST
 
 install-data-local: 
-	$(MKDIR_P) $(DESTDIR)$(HTML_DIR)/tutorial
+	$(MKDIR_P) $(DESTDIR)$(docdir)/tutorial
 	-$(INSTALL) -m 0644 $(srcdir)/tutorial/*.* \
-		$(DESTDIR)$(HTML_DIR)/tutorial
-	$(MKDIR_P) $(DESTDIR)$(HTML_DIR)/tutorial/images
+		$(DESTDIR)$(docdir)/tutorial
+	$(MKDIR_P) $(DESTDIR)$(docdir)/tutorial/images
 	-$(INSTALL) -m 0644 $(srcdir)/tutorial/images/*.* \
-		$(DESTDIR)$(HTML_DIR)/tutorial/images
-	$(MKDIR_P) $(DESTDIR)$(HTML_DIR)/tutorial/images/callouts
+		$(DESTDIR)$(docdir)/tutorial/images
+	$(MKDIR_P) $(DESTDIR)$(docdir)/tutorial/images/callouts
 	-$(INSTALL) -m 0644 $(srcdir)/tutorial/images/callouts/*.* \
-		$(DESTDIR)$(HTML_DIR)/tutorial/images/callouts
+		$(DESTDIR)$(docdir)/tutorial/images/callouts
 
 .PHONY: rebuild
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 4e375ff1..473e723f 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -18,8 +18,8 @@ rebuild:
 .PHONY: rebuild
 
 install-data-local: 
-	$(MKDIR_P) $(DESTDIR)$(HTML_DIR)/examples
-	-$(INSTALL) -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)/examples/
+	$(MKDIR_P) $(DESTDIR)$(docdir)/examples
+	-$(INSTALL) -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(docdir)/examples/
 
 clean-local:
 	test -f Makefile.am || rm -f test?.xml
diff --git a/doc/examples/index.py b/doc/examples/index.py
index 422ab2ae..fed3428c 100755
--- a/doc/examples/index.py
+++ b/doc/examples/index.py
@@ -240,8 +240,8 @@ rebuild:
 .PHONY: rebuild
 
 install-data-local: 
-	$(MKDIR_P) $(DESTDIR)$(HTML_DIR)/examples
-	-$(INSTALL) -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)/examples/
+	$(MKDIR_P) $(DESTDIR)$(docdir)/examples
+	-$(INSTALL) -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(docdir)/examples/
 
 clean-local:
 	test -f Makefile.am || rm -f test?.xml