diff -ru centericq-4.20.0/firetalk-0.1/toc.c centericq-4.20.0-kre/firetalk-0.1/toc.c
--- centericq-4.20.0/firetalk-0.1/toc.c	2004-08-04 12:11:04.000000000 +0200
+++ centericq-4.20.0-kre/firetalk-0.1/toc.c	2005-08-27 13:24:10.000000000 +0200
@@ -1391,28 +1391,28 @@
 	} else if (strcmp(arg0,"PAUSE") == 0) {
 		c->connectstate = 1;
 		firetalk_internal_set_connectstate(c,FCS_WAITING_SIGNON);
-	} else if (strcmp(arg0,"IM_IN") == 0) {
-		args = toc_parse_args(data,4);
+	} else if (strcmp(arg0,"IM_IN2") == 0) {
+		args = toc_parse_args(data,5);
 		if ((args[1] == NULL) || (args[2] == NULL) || (args[3] == NULL)) {
 			(void) toc_internal_disconnect(c,FE_INVALIDFORMAT);
 			return FE_INVALIDFORMAT;
 		}
-		(void) aim_handle_ect(c,args[1],args[3],args[2][0] == 'T' ? 1 : 0);
-		if (strlen(args[3]) > 0) {
+		(void) aim_handle_ect(c,args[1],args[4],args[2][0] == 'T' ? 1 : 0);
+		if (strlen(args[4]) > 0) {
 			char *mestart;
 
-			if (strncasecmp(args[3],"/me ",4) == 0)
-				firetalk_callback_im_getaction(c,args[1],args[2][0] == 'T' ? 1 : 0,&args[3][4]);
-			else if ((mestart = strstr(args[3],">/me ")) != NULL)
+			if (strncasecmp(args[4],"/me ",4) == 0)
+				firetalk_callback_im_getaction(c,args[1],args[2][0] == 'T' ? 1 : 0,&args[4][4]);
+			else if ((mestart = strstr(args[4],">/me ")) != NULL)
 				firetalk_callback_im_getaction(c,args[1],args[2][0] == 'T' ? 1 : 0,&mestart[5]);
 			else {
 				if (args[2][0] == 'T') /* interpolate only auto-messages */
-					firetalk_callback_im_getmessage(c,args[1],1,aim_interpolate_variables(args[3],c->nickname));
+					firetalk_callback_im_getmessage(c,args[1],1,aim_interpolate_variables(args[4],c->nickname));
 				else
-					firetalk_callback_im_getmessage(c,args[1],0,args[3]);
+					firetalk_callback_im_getmessage(c,args[1],0,args[4]);
 			}
 		}
-	} else if (strcmp(arg0,"UPDATE_BUDDY") == 0) {
+	} else if (strcmp(arg0,"UPDATE_BUDDY2") == 0) {
 		args = toc_parse_args(data,7);
 		if (!args[1] || !args[2] || !args[3] || !args[4] || !args[5] || !args[6]) {
 			(void) toc_internal_disconnect(c,FE_INVALIDFORMAT);
@@ -1580,6 +1580,7 @@
 	char *tempchr2;
 	int permit_mode;
 	firetalk_t fchandle;
+  int magicnum;
 
 got_data_connecting_start:
 	
@@ -1613,7 +1614,23 @@
 			firetalk_callback_needpass(c,password,128);
 
 			c->connectstate = 1;
-			r = toc_send_printf(c,"toc_signon login.oscar.aol.com 5190 %s %s english \"libfiretalk v" LIBFIRETALK_VERSION "\"",c->nickname,toc_hash_password(password));
+
+			magicnum = 0;
+			{
+				/* see www.snaphat.com/toc2.txt */
+				int a, b, cnum, sn, pw;
+
+				sn = c->nickname[0] - 96;
+				pw = (int)(password[0]) - 96;
+
+				a = sn * 7696 + 738816;
+				b = sn * 746512;
+				cnum = pw * a;
+
+				magicnum = cnum - a + b + 71665152;
+			}
+
+			r = toc_send_printf(c,"toc2_signon login.oscar.aol.com 5190 %s %s english \"TIC:naim\" 160 %d",c->nickname,toc_hash_password(password), magicnum);
 			if (r != FE_SUCCESS) {
 				firetalk_callback_connectfailed(c,r,NULL);
 				return r;
@@ -1659,11 +1676,11 @@
 					c->nickname = safe_strdup(args[1]);
 				}
 				c->connectstate = 3;
-			} else if (strcmp(arg0,"CONFIG") == 0) {
+			} else if (strcmp(arg0,"CONFIG2") == 0) {
 				fchandle = firetalk_find_handle(c);
 				args = toc_parse_args(data,2);
 				if (!args[1]) {
-					firetalk_callback_connectfailed(c,FE_INVALIDFORMAT,"CONFIG");
+					firetalk_callback_connectfailed(c,FE_INVALIDFORMAT,"CONFIG2");
 					return FE_INVALIDFORMAT;
 				}
 				tempchr1 = args[1];
diff -ru centericq-4.20.0/libicq2000-0.1/src/buffer.cpp centericq-4.20.0-kre/libicq2000-0.1/src/buffer.cpp
--- centericq-4.20.0/libicq2000-0.1/src/buffer.cpp	2004-02-11 00:51:21.000000000 +0100
+++ centericq-4.20.0-kre/libicq2000-0.1/src/buffer.cpp	2005-08-27 13:36:55.000000000 +0200
@@ -27,6 +27,8 @@
 using std::string;
 using std::endl;
 using std::ostream;
+using std::copy;
+using std::find;
 
 namespace ICQ2000
 {
diff -ru centericq-4.20.0/libicq2000-0.1/src/socket.cpp centericq-4.20.0-kre/libicq2000-0.1/src/socket.cpp
--- centericq-4.20.0/libicq2000-0.1/src/socket.cpp	2005-01-07 22:28:28.000000000 +0100
+++ centericq-4.20.0-kre/libicq2000-0.1/src/socket.cpp	2005-08-27 13:35:52.000000000 +0200
@@ -39,7 +39,8 @@
 using std::string;
 using std::ostringstream;
 using std::istringstream;
-//using std::copy;
+using std::copy;
+using std::find;
 
 namespace ICQ2000
 {
@@ -263,7 +264,8 @@
 
   unsigned long TCPSocket::gethostname(const char *hostname) {
 
-    unsigned int ip = htonl( StringtoIP(hostname) );
+    unsigned int ip = StringtoIP(hostname);
+    ip = htonl(ip);
     if (ip != 0) return ip;