diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 8c5bcb3e1b..8ee47f81ea 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -6,6 +6,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 2006/03/30
 	* Added execution of OnInterIfInit, OnCharIfInit and OnInterIfInitOnce on script
 	  reload. [Lance] 
+	* Cleaned up mistakes in irc.c [Lance]
 
 2006/03/29
 	* Now none of the pet-menu options will have any effect when the pet's
diff --git a/src/map/irc.c b/src/map/irc.c
index c61c5d890b..0104fcfb77 100644
--- a/src/map/irc.c
+++ b/src/map/irc.c
@@ -203,7 +203,7 @@ void irc_parse_sub(int fd, char *incoming_string)
 	char *source_nick=NULL;
 	char *source_ident=NULL;
 	char *source_host=NULL;
-//	char *state_mgr=NULL;
+	char *state_mgr=NULL;
 	
 	memset(source,'\0',256);
 	memset(command,'\0',256);
@@ -214,10 +214,9 @@ void irc_parse_sub(int fd, char *incoming_string)
 	sscanf(incoming_string, ":%255s %255s %255s :%4095[^\n]", source, command, target, message);
 	if (source != NULL) {
 		if (strstr(source,"!") != NULL) {
-			sscanf(source,"%s!%s@%s",source_nick, source_ident, source_host);
-			//source_nick = strtok_r(source,"!",&state_mgr);
-			//source_ident = strtok_r(NULL,"@",&state_mgr);
-			//source_host = strtok_r(NULL,"%%",&state_mgr);
+			source_nick = strtok_r(source,"!",&state_mgr);
+			source_ident = strtok_r(NULL,"@",&state_mgr);
+			source_host = strtok_r(NULL,"%%",&state_mgr);
 		}
 	}
 	if (irc_si->state == 0){
@@ -256,20 +255,15 @@ void irc_parse_sub(int fd, char *incoming_string)
 
 int send_to_parser(int fd, char *input,char key[2])
 {
-	char format[4];
 	char *temp_string=NULL;
-	char *next_string=NULL;
-//	char *state_mgr=NULL;
+	char *state_mgr=NULL;
 	int total_loops=0;
 
-	//temp_string = strtok_r(input,key,&state_mgr);
-	sprintf(format,"%s%s%s","%s",key,"%s");
-	sscanf(input, format, temp_string, next_string);
+	temp_string = strtok_r(input,key,&state_mgr);
 	while (temp_string != NULL){
 		total_loops = total_loops+1;
 		irc_parse_sub(fd,temp_string);
-		//temp_string = strtok_r(NULL,key,&state_mgr);
-		sscanf(next_string, format, temp_string, next_string);
+		temp_string = strtok_r(NULL,key,&state_mgr);
 	}
 	return total_loops;
 }
diff --git a/src/mysql/my_global.h b/src/mysql/my_global.h
index af723424d0..6c39374673 100644
--- a/src/mysql/my_global.h
+++ b/src/mysql/my_global.h
@@ -658,7 +658,7 @@ typedef SOCKET_SIZE_TYPE size_socket;
 #define SET_STACK_SIZE(X)	/* Not needed on real machines */
 
 #if !defined(HAVE_mit_thread) && !defined(HAVE_STRTOK_R)
-#define strtok_r(A,B,C) strtok((A),(B))
+#include "../common/strlib.h"
 #endif
 
 /* Remove some things that mit_thread break or doesn't support */