diff --git a/ChangeLog b/ChangeLog
index c4901b2e9c..79a7845ea6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 28 15:21:48 CET 2006 Daniel Veillard <veillard@redhat.com>
+
+	* NEWS configure.in libvirt.spec.in include/libvirt.h docs/*:
+	  preparing release 0.0.6
+
 Tue Feb 28 14:57:25 CET 2006 Daniel Veillard <veillard@redhat.com>
 
 	* docs/errors.html docs/libvir.html docs/*: added a page about
diff --git a/NEWS b/NEWS
index f8dbd1f2b4..51b1204ef5 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,14 @@
        http://libvirt.org/news.html
 
 Releases
+0.0.6: Feb 28 2006:
+   - add UUID lookup and extract API
+   - add error handling APIs both synchronous and asynchronous
+   - added minimal hook for error handling at the python level, improved the
+    python bindings
+   - augment the documentation and tests to cover error handling
+
+
 0.0.5: Feb 23 2006:
    - Added XML description parsing, dependance to libxml2, implemented the
     creation API virDomainCreateLinux()
diff --git a/configure.in b/configure.in
index ccfd6e1019..375164703d 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CANONICAL_HOST
 
 LIBVIRT_MAJOR_VERSION=0
 LIBVIRT_MINOR_VERSION=0
-LIBVIRT_MICRO_VERSION=5
+LIBVIRT_MICRO_VERSION=6
 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
diff --git a/docs/errors.html b/docs/errors.html
index 00f7499475..d1a1b8d7a5 100644
--- a/docs/errors.html
+++ b/docs/errors.html
@@ -33,13 +33,13 @@ set specifically to a connection with</p><p>So error handling in the code is the
     </ol></li>
 </ol><p>In all cases the error informations are provided as a <a href="html/libvirt-virterror.html#virErrorPtr">virErrorPtr</a> pointer to
 read-only structure <a href="html/libvirt-virterror.html#virError">virError</a> containing the
-following fields: </p><ul><li>code: an error number from the <a href="html/libvirt-virterror.html#virErrorNumber">virErrorNumber</a>
+following fields:</p><ul><li>code: an error number from the <a href="html/libvirt-virterror.html#virErrorNumber">virErrorNumber</a>
   enum</li>
   <li>domain: an enum indicating which part of libvirt raised the error see
     <a href="html/libvirt-virterror.html#virErrorDomain">virErrorDomain</a></li>
   <li>level: the error level, usually VIR_ERR_ERROR, though there is room for
     warnings like VIR_ERR_WARNING</li>
-  <li>message: the full human-readable formatted string of the error </li>
+  <li>message: the full human-readable formatted string of the error</li>
   <li>conn: if available a pointer to the <a href="html/libvirt-libvirt.html#virConnectPtr">virConnectPtr</a>
     connection to the hypervisor where this happened</li>
   <li>dom: if available a pointer to the <a href="html/libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain
diff --git a/docs/libvir.html b/docs/libvir.html
index d54ea6be24..34c767bad6 100644
--- a/docs/libvir.html
+++ b/docs/libvir.html
@@ -33,6 +33,15 @@ development of libvirt, it is preferable when possible to just use the <a
 href="downloads.html">CVS version or snapshot</a>, contact the mailing list
 and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progresses.</p>
 
+<h3>0.0.6: Feb 28 2006</h3>
+<ul>
+  <li>add UUID lookup and extract API</li>
+  <li>add error handling APIs both synchronous and asynchronous</li>
+  <li>added minimal hook for error handling at the python level, improved the
+    python bindings</li>
+  <li>augment the documentation and tests to cover error handling</li>
+</ul>
+
 <h3>0.0.5: Feb 23 2006</h3>
 <ul>
   <li>Added XML description parsing, dependance to libxml2, implemented the
@@ -417,7 +426,7 @@ set specifically to a connection with</p>
 href="html/libvirt-virterror.html#virErrorPtr">virErrorPtr</a> pointer to
 read-only structure <a
 href="html/libvirt-virterror.html#virError">virError</a> containing the
-following fields: </p>
+following fields:</p>
 <ul>
   <li>code: an error number from the <a
     href="html/libvirt-virterror.html#virErrorNumber">virErrorNumber</a>
@@ -427,7 +436,7 @@ following fields: </p>
   href="html/libvirt-virterror.html#virErrorDomain">virErrorDomain</a></li>
   <li>level: the error level, usually VIR_ERR_ERROR, though there is room for
     warnings like VIR_ERR_WARNING</li>
-  <li>message: the full human-readable formatted string of the error </li>
+  <li>message: the full human-readable formatted string of the error</li>
   <li>conn: if available a pointer to the <a
     href="html/libvirt-libvirt.html#virConnectPtr">virConnectPtr</a>
     connection to the hypervisor where this happened</li>
diff --git a/docs/news.html b/docs/news.html
index a2f965fe8e..77ee01014b 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -2,7 +2,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="libvirt.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>Releases</title></head><body><div id="container"><div id="intro"><div id="adjustments"></div><div id="pageHeader"></div><div id="content2"><h1 class="style1">Releases</h1><p>Here is the list of official releases, however since it is early on in the
 development of libvirt, it is preferable when possible to just use the <a href="downloads.html">CVS version or snapshot</a>, contact the mailing list
-and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progresses.</p><h3>0.0.5: Feb 23 2006</h3><ul><li>Added XML description parsing, dependance to libxml2, implemented the
+and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progresses.</p><h3>0.0.6: Feb 28 2006</h3><ul><li>add UUID lookup and extract API</li>
+  <li>add error handling APIs both synchronous and asynchronous</li>
+  <li>added minimal hook for error handling at the python level, improved the
+    python bindings</li>
+  <li>augment the documentation and tests to cover error handling</li>
+</ul><h3>0.0.5: Feb 23 2006</h3><ul><li>Added XML description parsing, dependance to libxml2, implemented the
     creation API virDomainCreateLinux()</li>
   <li>new APIs to lookup and name domain by UUID</li>
   <li>fixed the XML dump when using the Xend access</li>
diff --git a/include/libvirt.h b/include/libvirt.h
index e429c969fa..2e9f995cf7 100644
--- a/include/libvirt.h
+++ b/include/libvirt.h
@@ -167,7 +167,7 @@ typedef enum {
  * version * 1,000,000 + minor * 1000 + micro
  */
 
-#define LIBVIR_VERSION_NUMBER 5
+#define LIBVIR_VERSION_NUMBER 6
 
 int			virGetVersion		(unsigned long *libVer,
 						 const char *type,
diff --git a/include/libvirt/libvirt.h b/include/libvirt/libvirt.h
index e429c969fa..2e9f995cf7 100644
--- a/include/libvirt/libvirt.h
+++ b/include/libvirt/libvirt.h
@@ -167,7 +167,7 @@ typedef enum {
  * version * 1,000,000 + minor * 1000 + micro
  */
 
-#define LIBVIR_VERSION_NUMBER 5
+#define LIBVIR_VERSION_NUMBER 6
 
 int			virGetVersion		(unsigned long *libVer,
 						 const char *type,
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 14000dfee6..665afa7da7 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -99,6 +99,12 @@ rm -fr %{buildroot}
 %doc python/libvirtclass.txt
 
 %changelog
+* Tue Feb 28 2006 Daniel Veillard <veillard@redhat.com> 0.0.6-1
+- added error handling APIs
+- small bug fixes
+- improve python bindings
+- augment documentation and regression tests
+
 * Thu Feb 23 2006 Daniel Veillard <veillard@redhat.com> 0.0.5-1
 - new domain creation API
 - new UUID based APIs
diff --git a/python/Makefile.am b/python/Makefile.am
index 96865a44dd..f0d75a7325 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -50,7 +50,8 @@ GENERATED= libvirt.py \
            libvirt-export.c \
            libvirtclass.txt \
 	   libvirt-py.c \
-	   libvirt-py.h
+	   libvirt-py.h \
+	   libvirtclass.py
 
 CLEANFILES= $(GENERATED) gen_prog libvirt.py