diff --git a/Changes b/Changes
index f602b41de..6450b554a 100644
--- a/Changes
+++ b/Changes
@@ -451,3 +451,7 @@
   (#0002096) suggested by White_Magic
 - Added support for using \\ in the config file to indicate a \ (#0002178) reported by
   TimeFX
+- Added documentation for set::options::fail-oper-warn (#0002166) reported by Snake
+- Removed an extra ) in the Throttle disconnect message (#0002165) reported by Snake
+- Fixed a bug where the "looking up your hostname" message could still be displayed even
+  if hostname resolving was disabled (#0002161) reported by Xuefer
diff --git a/doc/unreal32docs.html b/doc/unreal32docs.html
index 537d54402..6f3434247 100644
--- a/doc/unreal32docs.html
+++ b/doc/unreal32docs.html
@@ -27,7 +27,7 @@ English | <a href="unreal32docs.de.html">German</a> |
 <div align="center"><b><font size="7">UnrealIRCd</font></b><br>
   <font size="4"><a href="http://www.unrealircd.com">http://www.unrealircd.com</a></font><br>
   <font size="4">Version: 3.2.2-CVS</font><br>
-  <b>Last doc update:</b> 2004-10-11</div>
+  <b>Last doc update:</b> 2004-10-13</div>
 <br>
   <b>Head Coders:</b> Stskeeps / codemastr / Syzop / Luke<br>
   <b>Contributors:</b> McSkaf / Zogg / NiQuiL / assyrian / chasm / DrBin / llthangel / Griever / nighthawk<br>
@@ -2165,6 +2165,8 @@ set {
   by non-opers is sent to the EYES snomask.</p>
 <p><font class="set">set::options::allow-part-if-shunned;</font><br>
   Allow shunned user to use /part.</p>
+<p><font class="set">set::options::fail-oper-warn;</font><br>
+  If present, a user will be notified that his/her failed /oper attempt has been logged.</p>
 <p><font class="set">set::dns::timeout &lt;timevalue&gt;;</font><br>
   A time value specifying the length of time a DNS server has to respond before 
   a timeout. A time value is a numeric string with d meaning days, h meaning hours, 
diff --git a/src/s_bsd.c b/src/s_bsd.c
index 456abec49..07f9c7ba9 100644
--- a/src/s_bsd.c
+++ b/src/s_bsd.c
@@ -1282,7 +1282,7 @@ add_con_refuse:
 			{
 				ircsprintf(zlinebuf,
 					"ERROR :Closing Link: [%s] (Throttled: Reconnecting too fast) -"
-						"Email %s for more information.)\r\n",
+						"Email %s for more information.\r\n",
 						Inet_ia2p(&acptr->ip),
 						KLINE_ADDRESS);
 				set_non_blocking(fd, acptr);
@@ -1342,13 +1342,12 @@ void	start_of_normal_client_handshake(aClient *acptr)
 {
 	Link	lin;
 	acptr->status = STAT_UNKNOWN;	
-	if (SHOWCONNECTINFO && !acptr->serv) {
-		sendto_one(acptr, "%s", REPORT_DO_DNS);
-	}
-	lin.flags = ASYNC_CLIENT;
-	lin.value.cptr = acptr;
 	if (DONT_RESOLVE)
 		goto skipdns;
+	if (SHOWCONNECTINFO && !acptr->serv)
+		sendto_one(acptr, "%s", REPORT_DO_DNS);
+	lin.flags = ASYNC_CLIENT;
+	lin.value.cptr = acptr;
 	Debug((DEBUG_DNS, "lookup %s", acptr->sockhost));
 	acptr->hostp = gethost_byaddr((char *)&acptr->ip, &lin);