diff --git a/ChangeLog b/ChangeLog
index c57857a6c..7e4637feb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+jilles      2007/08/29 22:04:45 UTC	(20070829-3562)
+  Log:
+  Clarify format of IPv6 addresses in auth{} and connect{}.
+  
+
+  Changes:	Modified:
+  +7 -3		trunk/doc/example.conf (File Modified) 
+  +9 -2		trunk/doc/reference.conf (File Modified) 
+
+
 jilles      2007/08/23 21:02:31 UTC	(20070823-3560)
   Log:
   Add more information about invitations and invexes.
diff --git a/doc/sgml/oper-guide/config.sgml b/doc/sgml/oper-guide/config.sgml
index 0163a4351..8de50d712 100644
--- a/doc/sgml/oper-guide/config.sgml
+++ b/doc/sgml/oper-guide/config.sgml
@@ -293,7 +293,13 @@ auth {
 	  <varlistentry>
             <term>user</term>
             <listitem>
-              <para>A hostmask (user@host) that the auth{} block is matched against. You can have multiple user entries.</para>
+              <para>
+                A hostmask (user@host) that the auth {} block applies to.
+                It is matched against the hostname and IP address (using ::
+                shortening for IPv6 and prepending a 0 if it starts with
+                a colon) and can also use CIDR masks.
+                You can have multiple user entries.
+              </para>
             </listitem>
           </varlistentry>
 	  <varlistentry>
@@ -555,6 +561,10 @@ connect "<replaceable>name</replaceable>" {
 		Furthermore, if a hostname is used, it must have an A or AAAA
 		record (no CNAME) and it must be the primary
 		hostname for inbound connections to work.
+	      </para><para>
+	        IPv6 addresses must be in :: shortened form; addresses which
+		then start with a colon must be prepended with a zero,
+		for example 0::1.
 	      </para></note>
 	    </listitem>
 	  </varlistentry>
diff --git a/include/serno.h b/include/serno.h
index 2640e8698..dfd90fe54 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070823-3560"
+#define SERNO "20070829-3562"