diff --git a/ChangeLog b/ChangeLog
index 739f863..cd9dc8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Sep 12 22:14:55 CEST 2001 Daniel Veillard <daniel@veillard.com>
+
+	* config.h.in configure.in libxml.spec.in include/libxml/Makefile.am
+	  libxml-2.0.pc.in: moved includes to includedir/libxml2/libxml,
+	  updated the configuration scripts systems accordingly
+
 Wed Sep 12 20:49:32 CEST 2001 Daniel Veillard <daniel@veillard.com>
 
 	* configure.in: preparing for 2.4.4
diff --git a/config.h.in b/config.h.in
index 07ded07..bf54bc0 100644
--- a/config.h.in
+++ b/config.h.in
@@ -91,9 +91,6 @@
 /* Define if you have the <dirent.h> header file.  */
 #undef HAVE_DIRENT_H
 
-/* Define if you have the <dlfcn.h> header file.  */
-#undef HAVE_DLFCN_H
-
 /* Define if you have the <errno.h> header file.  */
 #undef HAVE_ERRNO_H
 
diff --git a/configure.in b/configure.in
index a80634f..3a8eadf 100644
--- a/configure.in
+++ b/configure.in
@@ -143,7 +143,7 @@
   [AC_DEFINE(HAVE_ISINF)]))
 
 XML_LIBDIR='-L${libdir}'
-XML_INCLUDEDIR='-I${includedir}/libxml -I${includedir}'
+XML_INCLUDEDIR='-I${includedir}/libxml2/libxml -I${includedir}/libxml2'
 
 dnl
 dnl Extra flags
diff --git a/include/libxml/Makefile.am b/include/libxml/Makefile.am
index 38ad0ef..d284328 100644
--- a/include/libxml/Makefile.am
+++ b/include/libxml/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-xmlincdir = $(includedir)/libxml
+xmlincdir = $(includedir)/libxml2/libxml
 
 xmlinc_HEADERS = \
 		SAX.h \
@@ -32,6 +32,6 @@
 		catalog.h
 
 install-exec-hook:
-	$(mkinstalldirs) $(DESTDIR)$(xmlincdir) $(DESTDIR)$(xmlincdir)/libxml
+	$(mkinstalldirs) $(DESTDIR)$(xmlincdir)/libxml2 $(DESTDIR)$(xmlincdir)/libxml2/libxml
 
 EXTRA_DIST = xmlversion.h.in xmlwin32version.h.in
diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in
index d93b3e7..328059b 100644
--- a/libxml-2.0.pc.in
+++ b/libxml-2.0.pc.in
@@ -6,7 +6,7 @@
 
 Name: libXML
 Version: @VERSION@
-Description: libXML library.
+Description: libXML library version2.
 Requires:
 Libs: -L${libdir} -lxml2 @Z_LIBS@ @M_LIBS@ @LIBS@
-Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@
+Cflags: -I${includedir}/libxml2/libxml @XML_CFLAGS@
diff --git a/libxml.spec.in b/libxml.spec.in
index efef779..9303d3f 100644
--- a/libxml.spec.in
+++ b/libxml.spec.in
@@ -117,8 +117,8 @@
 %defattr(-, root, root)
 
 %doc AUTHORS ChangeLog NEWS README COPYING COPYING.LIB TODO
-%doc /usr/share/man/man1/xmllint.1*
-%doc /usr/share/man/man4/libxml.4*
+%doc %{prefix}/share/man/man1/xmllint.1*
+%doc %{prefix}/share/man/man4/libxml.4*
 
 %{prefix}/lib/lib*.so.*
 %{prefix}/bin/xmllint
@@ -136,5 +136,4 @@
 %{prefix}/include/*
 %{prefix}/bin/xml2-config
 %{prefix}/share/aclocal/libxml.m4
-# I'm not certain if this should be included in the distribution or not.
-#%{prefix}/lib/pkgconfig/libxml-2.0.pc
+%{prefix}/lib/pkgconfig/libxml-2.0.pc