diff --git a/ChangeLog b/ChangeLog
index 26fc3f7..06a80a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+jilles      2007/06/10 16:14:03 UTC	(20070610-3516)
+  Log:
+  Version bump on trunk to 2.3.
+  
+
+  Changes:	Modified:
+  +1 -1		trunk/configure.ac (File Modified) 
+
+
 nenolod     2007/06/06 16:25:21 UTC	(20070606-3514)
   Log:
   - "please report this to the ratbox developers" -> "please report this to the charybdis developers". not sure how we overlooked this for so long.
diff --git a/include/serno.h b/include/serno.h
index da98cfc..af9ef24 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070606-3514"
+#define SERNO "20070610-3516"
diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index 155e661..3a58402 100644
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_nick.c 3420 2007-04-22 14:02:54Z jilles $
+ *  $Id: m_nick.c 3518 2007-06-22 21:59:09Z jilles $
  */
 
 #include "stdinc.h"
@@ -85,7 +85,7 @@ struct Message save_msgtab = {
 mapi_clist_av1 nick_clist[] = { &nick_msgtab, &uid_msgtab, &euid_msgtab,
 	&save_msgtab, NULL };
 
-DECLARE_MODULE_AV1(nick, NULL, NULL, nick_clist, NULL, NULL, "$Revision: 3420 $");
+DECLARE_MODULE_AV1(nick, NULL, NULL, nick_clist, NULL, NULL, "$Revision: 3518 $");
 
 static int change_remote_nick(struct Client *, struct Client *, time_t,
 			      const char *, int);
@@ -1219,7 +1219,7 @@ register_client(struct Client *client_p, struct Client *server,
 		free_nd_entry(nd);
 
 	add_to_client_hash(nick, source_p);
-	add_to_hostname_hash(source_p->host, source_p);
+	add_to_hostname_hash(source_p->orighost, source_p);
 	monitor_signon(source_p);
 
 	m = &parv[4][1];