diff --git a/ChangeLog b/ChangeLog
index ce32e2b848..13c42ea0ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 16 17:36:24 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+	* docs/libvir.html, docs/remote.html: Re-write notes on IPV6
+	support in the remote daemon
+
 Mon Jul 16 16:59:24 EST 2007 Daniel P. Berrange <berrange@redhat.com>
 
 	* src/qemu_conf.c, src/qemu_conf.h, src/xend_internal.c,
diff --git a/docs/libvir.html b/docs/libvir.html
index 11b7132edd..c33b67ed92 100644
--- a/docs/libvir.html
+++ b/docs/libvir.html
@@ -2239,8 +2239,14 @@ Blank lines and comments beginning with <code>#</code> are ignored.
 <h3><a name="Remote_IPv6">IPv6 support</a></h3>
 
 <p>
-IPv6 has received some limited testing and should work.  Problems with
-libvirt and IPv6 should be reported as <a href="bugs.html">bugs</a>.
+The libvirtd service and libvirt remote client driver both use the
+<code>getaddrinfo()</code> functions for name resolution and are
+thus fully IPv6 enabled. ie, if a server has IPv6 address configured
+the daemon will listen for incoming connections on both IPv4 and IPv6
+protocols. If a client has an IPv6 address configured and the DNS
+address resolved for a service is reachable over IPv6, then an IPv6
+connection will be made, otherwise IPv4 will be used. In summary it
+should just 'do the right thing(tm)'.
 </p>
 
 <h3><a name="Remote_limitations">Limitations</a></h3>
diff --git a/docs/remote.html b/docs/remote.html
index 22eaddefd1..d7810f06df 100644
--- a/docs/remote.html
+++ b/docs/remote.html
@@ -548,8 +548,14 @@ Blank lines and comments beginning with <code>#</code> are ignored.
   </p>
 </td>
 </tr></table><h3><a name="Remote_IPv6" id="Remote_IPv6">IPv6 support</a></h3><p>
-IPv6 has received some limited testing and should work.  Problems with
-libvirt and IPv6 should be reported as <a href="bugs.html">bugs</a>.
+The libvirtd service and libvirt remote client driver both use the
+<code>getaddrinfo()</code> functions for name resolution and are
+thus fully IPv6 enabled. ie, if a server has IPv6 address configured
+the daemon will listen for incoming connections on both IPv4 and IPv6
+protocols. If a client has an IPv6 address configured and the DNS
+address resolved for a service is reachable over IPv6, then an IPv6
+connection will be made, otherwise IPv4 will be used. In summary it
+should just 'do the right thing(tm)'.
 </p><h3><a name="Remote_limitations" id="Remote_limitations">Limitations</a></h3><ul><li> Remote storage: To be fully useful, particularly for
 creating new domains, it should be possible to enumerate
 and provision storage on the remote machine.  This is currently