diff --git a/CHANGELOG b/CHANGELOG
index 5b56247..4c3ab30 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -28,6 +28,7 @@ CHANGES:
 	- Added support for CNAME/TXT/A/MX query types, fixes #75.
 		Patch by Anne Bezemer, merge help by logix.
 	- Merged low-latency patch from Anne Bezemer, fixes #76.
+	- Resolve client nameserver argument (except on win32), #82.
 
 2009-06-01: 0.5.2 "WifiFree"
 	- Fixed client segfault on OS X, #57
diff --git a/man/iodine.8 b/man/iodine.8
index 37f886d..246d626 100644
--- a/man/iodine.8
+++ b/man/iodine.8
@@ -220,7 +220,8 @@ in production environments.
 .TP
 .B nameserver
 The nameserver to use to relay the dns traffic. This can be any relaying
-nameserver  or the ip number of the server running iodined if reachable.
+nameserver or the server running iodined if reachable. This field can be
+given as an IP address, or as a hostname (except on Win32 currently).
 This argument is optional, and if not specified a nameserver will be read
 from the
 .I /etc/resolv.conf
diff --git a/src/client.c b/src/client.c
index ad69aba..09a81d9 100644
--- a/src/client.c
+++ b/src/client.c
@@ -149,7 +149,7 @@ client_set_nameserver(const char *cp, int port)
 		/* MinGW only supports getaddrinfo on WinXP and higher..
 		 * so turn it off in windows for now
 		 *
-		 * try resolving if domain a domain is given */
+		 * try resolving if a domain is given */
 		struct addrinfo *addrinfo;
 		struct addrinfo *res;
 		if (getaddrinfo(cp, NULL, NULL, &addrinfo) == 0) {
diff --git a/src/iodine.c b/src/iodine.c
index 97bb5d2..14992cc 100644
--- a/src/iodine.c
+++ b/src/iodine.c
@@ -89,7 +89,8 @@ help() {
 	fprintf(stderr, "  -I max interval between requests (default 4 sec) to prevent server timeouts\n");
 	fprintf(stderr, "  -z context, to apply specified SELinux context after initialization\n");
 	fprintf(stderr, "  -F pidfile to write pid to a file\n");
-	fprintf(stderr, "nameserver is the IP number of the relaying nameserver, if absent /etc/resolv.conf is used\n");
+	fprintf(stderr, "nameserver is the IP number/hostname of the relaying nameserver\n    "
+			"(hostname not supported on win32). if absent, /etc/resolv.conf is used\n");
 	fprintf(stderr, "topdomain is the FQDN that is delegated to the tunnel endpoint.\n");
 
 	exit(0);