diff --git a/CHANGELOG b/CHANGELOG
index fe7ad2d..cc59afb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,10 @@ iodine - http://code.kryo.se/iodine
 CHANGES:
 
 master:
+	- IPv6 support (in progress, #107)
+	   Client can connect to iodined through an IPv6 nameserver.
+	   Server only supports IPv4 for now.
+	   Traffic inside tunnel is IPv4.
 	- Add socket activation for systemd, by Michael Scherer.
 	- Add automated lookup of external ip (via -n auto).
 	- Bugfix for OS X (Can't assign requested address)
diff --git a/README b/README
index d9e3c29..0ef5614 100644
--- a/README
+++ b/README
@@ -103,6 +103,13 @@ end of the tunnel. In this case, ping 192.168.99.1 from the iodine client, and
 
 MISC. INFO:
 
+IPv6:
+At the moment the iodined server only supports IPv4. The client can use
+IPv4 or IPv6 nameservers to connect, and the relay nameservers will translate
+between protocols automatically if needed. If the server hostname has an AAAA
+record registered IPv6 mode will not work - in this case the client must be
+configured with an IPv4 nameserver. The data inside the tunnel is IPv4 only.
+
 Routing:
 It is possible to route all traffic through the DNS tunnel. To do this, first
 add a host route to the nameserver used by iodine over the wired/wireless
diff --git a/README-win32.txt b/README-win32.txt
index de9124b..4a371f1 100644
--- a/README-win32.txt
+++ b/README-win32.txt
@@ -9,7 +9,7 @@ Extra README file for Win32 related stuff
 
 == Running iodine on Windows:
 
-0. After iodine 0.6, you need Windows XP or newer to run.
+0. After iodine 0.6, you need Windows Vista or newer to run.
 
 1. Install the TAP32 driver 
    http://openvpn.net/index.php/open-source/downloads.html
diff --git a/man/iodine.8 b/man/iodine.8
index 349ba6f..e3adcac 100644
--- a/man/iodine.8
+++ b/man/iodine.8
@@ -289,8 +289,8 @@ This should be combined with systemd or upstart on demand activation for being e
 .B nameserver
 The nameserver to use to relay the dns traffic. This can be any relaying
 nameserver or the server running iodined if reachable. This field can be
-given as an IP address, or as a hostname. This argument is optional, and 
-if not specified a nameserver will be read from the
+given as an IPv4/IPv6 address or as a hostname. This argument is optional,
+and if not specified a nameserver will be read from the
 .I /etc/resolv.conf
 file.
 .TP