diff --git a/IRCSock.cpp b/IRCSock.cpp
index dd025177..a0aa4b18 100644
--- a/IRCSock.cpp
+++ b/IRCSock.cpp
@@ -356,7 +356,7 @@ void CIRCSock::ReadLine(const CString& sData) {
 			CString sNickMask = sLine.Token(0);
 			sNickMask.LeftChomp();
 
-			CString sNick = sNickMask.Token(0, false, '!');
+			CString sNick = sNickMask.Token(0, false, "!");
 			CString sCmd = sLine.Token(1);
 			CString sRest = sLine.Token(2, true);
 
@@ -881,12 +881,12 @@ void CIRCSock::ParseISupport(const CString& sLine) {
 	CString sArg = sLine.Token(i++);
 
 	while (!sArg.empty()) {
-		CString sName = sArg.Token(0, false, '=');
-		CString sValue = sArg.Token(1, true, '=');
+		CString sName = sArg.Token(0, false, "=");
+		CString sValue = sArg.Token(1, true, "=");
 
 		if (sName.CaseCmp("PREFIX") == 0) {
-			CString sPrefixes = sValue.Token(1, false, ')');
-			CString sPermModes = sValue.Token(0, false, ')');
+			CString sPrefixes = sValue.Token(1, false, ")");
+			CString sPermModes = sValue.Token(0, false, ")");
 			sPermModes.LeftTrim("(");
 
 			if (!sPrefixes.empty() && sPermModes.size() == sPrefixes.size()) {
@@ -904,7 +904,7 @@ void CIRCSock::ParseISupport(const CString& sLine) {
 				m_mueChanModes.clear();
 
 				for (unsigned int a = 0; a < 4; a++) {
-					CString sModes = sValue.Token(a, false, ',');
+					CString sModes = sValue.Token(a, false, ",");
 
 					for (unsigned int b = 0; b < sModes.size(); b++) {
 						m_mueChanModes[sModes[b]] = (EChanModeArgs) a;
diff --git a/UserSock.cpp b/UserSock.cpp
index 2982a0ce..a2b46dc3 100644
--- a/UserSock.cpp
+++ b/UserSock.cpp
@@ -52,8 +52,8 @@ void CUserSock::ReadLine(const CString& sData) {
 			m_sPass = sLine.Token(1);
 
 			if (m_sPass.find(":") != CString::npos) {
-				m_sUser = m_sPass.Token(0, false, ':');
-				m_sPass = m_sPass.Token(1, true, ':');
+				m_sUser = m_sPass.Token(0, false, ":");
+				m_sPass = m_sPass.Token(1, true, ":");
 			}
 
 			if ((m_bGotNick) && (m_bGotUser)) {
diff --git a/modules/away.cpp b/modules/away.cpp
index bbce39ff..4240ff0a 100644
--- a/modules/away.cpp
+++ b/modules/away.cpp
@@ -20,6 +20,9 @@
  *
  * 
  * $Log$
+ * Revision 1.16  2005/06/30 21:51:06  prozacx
+ * Changed CString::Token() to split on a string rather than char
+ *
  * Revision 1.15  2005/06/12 09:04:39  prozacx
  * Changed to new GetSavePath()
  *
@@ -258,9 +261,9 @@ public:
 			map< CString, vector< CString> > msvOutput;
 			for( u_int a = 0; a < m_vMessages.size(); a++ )
 			{
-				CString sTime = m_vMessages[a].Token( 0, false, ':' );
-				CString sWhom = m_vMessages[a].Token( 1, false, ':' );
-				CString sMessage = m_vMessages[a].Token( 2, true, ':' );
+				CString sTime = m_vMessages[a].Token( 0, false, ":" );
+				CString sWhom = m_vMessages[a].Token( 1, false, ":" );
+				CString sMessage = m_vMessages[a].Token( 2, true, ":" );
 				
 				if ( ( sTime.empty() ) || ( sWhom.empty() ) || ( sMessage.empty() ) )
 				{
diff --git a/znc.cpp b/znc.cpp
index 412d0566..c56a351f 100644
--- a/znc.cpp
+++ b/znc.cpp
@@ -105,7 +105,7 @@ int CZNC::Loop() {
 				}
 
 				if (File.Open(O_WRONLY | O_TRUNC | O_CREAT)) {
-					CString sData = m_sISpoofFormat.Token(0, false, '%') + pUser->GetIdent() + m_sISpoofFormat.Token(1, true, '%');
+					CString sData = m_sISpoofFormat.Token(0, false, "%") + pUser->GetIdent() + m_sISpoofFormat.Token(1, true, "%");
 					File.Write(sData + "\n");
 					File.Close();
 				}
@@ -635,8 +635,8 @@ bool CZNC::ParseConfig(const CString& sConfig) {
 		}
 
 		// If we have a regular line, figure out where it goes
-		CString sName = sLine.Token(0, false, '=');
-		CString sValue = sLine.Token(1, true, '=');
+		CString sName = sLine.Token(0, false, "=");
+		CString sValue = sLine.Token(1, true, "=");
 		sName.Trim();
 		sValue.Trim();