--- Makefile.in
+++ Makefile.in
@@ -843,8 +843,8 @@ cmake_DATA = libxml2-config.cmake
 #
 # Install the tests program sources as examples 
 #
-BASE_DIR = $(datadir)/doc
-DOC_MODULE = libxml2-$(VERSION)
+BASE_DIR = $(datadir)/doc/packages
+DOC_MODULE = libxml2
 EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
 
 #
--- python/Makefile.in
+++ python/Makefile.in
@@ -488,7 +488,7 @@ top_srcdir = @top_srcdir@
 # Makefile for libxml2 python library
 AUTOMAKE_OPTIONS = 1.4 foreign
 SUBDIRS = . tests
-docsdir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)
+docsdir = $(datadir)/doc/packages/libxml2-python
 dist_docs_DATA = TODO
 EXTRA_DIST = \
 	setup.py		\
--- python/tests/Makefile.in
+++ python/tests/Makefile.in
@@ -383,7 +383,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-exampledir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples
+exampledir = $(datadir)/doc/packages/libxml2-python/examples
 dist_example_DATA = $(PYTESTS) $(XMLS)
 PYTESTS = \
     build.py	\
--- configure
+++ configure
@@ -12750,7 +12750,7 @@ fi
 if test "${with_html_subdir+set}" = set; then :
   withval=$with_html_subdir; test "x$withval" != "x" && HTML_DIR="$HTML_DIR/$withval"
 else
-  HTML_DIR="$HTML_DIR/\$(PACKAGE)-\$(VERSION)/html"
+  HTML_DIR="$HTML_DIR/packages/\$(PACKAGE)/html"
 fi