diff --git a/ChangeLog b/ChangeLog
index 92ea720287d7cee94cc5905e591562b080156c57..5a4c6e035bf157b562d464a907bb9bf6c131bca7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb 15 08:20:23 EST 2006 Daniel Veillard <veillard@redhat.com>
+
+	* configure.in libvirt.spec.in include/libvirt.h.in python/Makefile.am
+	  src/Makefile.am: fix rpm packaging problems whith head, more 
+	  LIBVIR -> LIBVIRT changes.
+
 Tue Feb 14 15:29:01 EST 2006 Daniel Veillard <veillard@redhat.com>
 
 	* Makefile.am configure.in python/Makefile.am python/tests/Makefile.am
diff --git a/configure.in b/configure.in
index 6982849ef53e152d89f22d2949fe313288d4fd0f..38162d26457c439db6dff292c96d68d2965ef0f3 100644
--- a/configure.in
+++ b/configure.in
@@ -3,33 +3,33 @@ AC_INIT(src/libvirt.c)
 AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_HOST
 
-LIBVIR_MAJOR_VERSION=0
-LIBVIR_MINOR_VERSION=0
-LIBVIR_MICRO_VERSION=4
-LIBVIR_MICRO_VERSION_SUFFIX=
-LIBVIR_VERSION=$LIBVIR_MAJOR_VERSION.$LIBVIR_MINOR_VERSION.$LIBVIR_MICRO_VERSION$LIBVIR_MICRO_VERSION_SUFFIX
-LIBVIR_VERSION_INFO=`expr $LIBVIR_MAJOR_VERSION + $LIBVIR_MINOR_VERSION`:$LIBVIR_MICRO_VERSION:$LIBVIR_MINOR_VERSION
+LIBVIRT_MAJOR_VERSION=0
+LIBVIRT_MINOR_VERSION=0
+LIBVIRT_MICRO_VERSION=4
+LIBVIRT_MICRO_VERSION_SUFFIX=
+LIBVIRT_VERSION=$LIBVIRT_MAJOR_VERSION.$LIBVIRT_MINOR_VERSION.$LIBVIRT_MICRO_VERSION$LIBVIRT_MICRO_VERSION_SUFFIX
+LIBVIRT_VERSION_INFO=`expr $LIBVIRT_MAJOR_VERSION + $LIBVIRT_MINOR_VERSION`:$LIBVIRT_MICRO_VERSION:$LIBVIRT_MINOR_VERSION
 
-LIBVIR_VERSION_NUMBER=`expr $LIBVIR_MAJOR_VERSION \* 1000000 + $LIBVIR_MINOR_VERSION \* 1000 + $LIBVIR_MICRO_VERSION`
+LIBVIRT_VERSION_NUMBER=`expr $LIBVIRT_MAJOR_VERSION \* 1000000 + $LIBVIRT_MINOR_VERSION \* 1000 + $LIBVIRT_MICRO_VERSION`
 
 if test -f CVS/Entries; then
   extra=`grep ChangeLog CVS/Entries | grep -v LIBVIR | sed -e s\%/ChangeLog/1\.%% -e s\%/.*$%%`
   echo extra=$extra
   if test "$extra" != ""
   then
-      LIBVIR_VERSION_EXTRA="-CVS$extra"
+      LIBVIRT_VERSION_EXTRA="-CVS$extra"
   fi
 fi
 
-AC_SUBST(LIBVIR_MAJOR_VERSION)
-AC_SUBST(LIBVIR_MINOR_VERSION)
-AC_SUBST(LIBVIR_MICRO_VERSION)
-AC_SUBST(LIBVIR_VERSION)
-AC_SUBST(LIBVIR_VERSION_INFO)
-AC_SUBST(LIBVIR_VERSION_NUMBER)
-AC_SUBST(LIBVIR_VERSION_EXTRA)
+AC_SUBST(LIBVIRT_MAJOR_VERSION)
+AC_SUBST(LIBVIRT_MINOR_VERSION)
+AC_SUBST(LIBVIRT_MICRO_VERSION)
+AC_SUBST(LIBVIRT_VERSION)
+AC_SUBST(LIBVIRT_VERSION_INFO)
+AC_SUBST(LIBVIRT_VERSION_NUMBER)
+AC_SUBST(LIBVIRT_VERSION_EXTRA)
 
-VERSION=${LIBVIR_VERSION}
+VERSION=${LIBVIRT_VERSION}
 
 AM_INIT_AUTOMAKE(libvirt, $VERSION)
 
diff --git a/include/libvirt.h.in b/include/libvirt.h.in
index a0000cc4e09dcbf691e736dae056053c4b508271..aa7e0221e230a9c171f52789fc884ba04161f916 100644
--- a/include/libvirt.h.in
+++ b/include/libvirt.h.in
@@ -167,7 +167,7 @@ typedef enum {
  * version * 1,000,000 + minor * 1000 + micro
  */
 
-#define LIBVIR_VERSION_NUMBER @LIBVIR_VERSION_NUMBER@
+#define LIBVIR_VERSION_NUMBER @LIBVIRT_VERSION_NUMBER@
 
 int			virGetVersion		(unsigned long *libVer,
 						 const char *type,
diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index a0000cc4e09dcbf691e736dae056053c4b508271..aa7e0221e230a9c171f52789fc884ba04161f916 100644
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -167,7 +167,7 @@ typedef enum {
  * version * 1,000,000 + minor * 1000 + micro
  */
 
-#define LIBVIR_VERSION_NUMBER @LIBVIR_VERSION_NUMBER@
+#define LIBVIR_VERSION_NUMBER @LIBVIRT_VERSION_NUMBER@
 
 int			virGetVersion		(unsigned long *libVer,
 						 const char *type,
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 1911aba1576ccc045792d7d91c4d9916f8825fd1..64c330ebbe3ce8b43777bb56ef4493beeb0b59c0 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -86,6 +86,7 @@ rm -fr %{buildroot}
 %doc AUTHORS NEWS README COPYING.LIB
 %{_libdir}/python*/site-packages/libvirt.py*
 %{_libdir}/python*/site-packages/libvirtmod*
+%doc python/tests/*.py
 %doc python/TODO
 %doc python/libvirtclass.txt
 
diff --git a/python/Makefile.am b/python/Makefile.am
index a31c17da6d028f8844d9c5b608cebe496faf5324..c57b9f7e683a4b3dce0725f16c3e18c59e24745a 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile for libvirt python library
 
-SUBRIRS= . tests
+SUBDIRS= . tests
 
 INCLUDES = \
         -I$(PYTHON_INCLUDES) \
@@ -8,7 +8,7 @@ INCLUDES = \
 	-I$(top_builddir)/include \
 	-I$(top_builddir)/$(subdir)
 
-DOCS_DIR = $(datadir)/doc/libvirt-python-$(LIBVIR_VERSION)
+DOCS_DIR = $(datadir)/doc/libvirt-python-$(LIBVIRT_VERSION)
 
 DOCS = ${srcdir}/TODO
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 534d77b790050b43c2b0d7dbc15c4ac20b1251ee..7caad2da20e6d6067560ed3a367ef3a4820f0527 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,7 @@ EXTRA_DIST = libvirt_sym.version
 lib_LTLIBRARIES = libvirt.la
 libvirt_la_LIBADD = 
 libvirt_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libvirt_sym.version \
-                    -version-info @LIBVIR_VERSION_INFO@
+                    -version-info @LIBVIRT_VERSION_INFO@
 libvirt_la_SOURCES =						\
 		libvirt.c internal.h				\
 		hash.c hash.h					\