diff --git a/CHANGES b/CHANGES
index ab0943f..9bcc176 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@
       expose the password in the process list.
     - Fix parsing of JOIN messages for certain servers.
       Thanks Ivan Kanakarakis!
+    - Use , rather than _ for slash characters in channel names.
+      As per RFC , is not allowed in a channel name, while _ is.
+      Thanks plomplomplom and Nils Dagsson Moskopp!
 
 1.6 (2011-01-31):
     - fix regression introduced for handling unknown commands
diff --git a/ii.c b/ii.c
index 6eeeb04..531c2ee 100644
--- a/ii.c
+++ b/ii.c
@@ -52,7 +52,7 @@ static void usage() {
 static char *striplower(char *s) {
 	char *p = NULL;
 	for(p = s; p && *p; p++) {
-		if(*p == '/') *p = '_';
+		if(*p == '/') *p = ',';
 		*p = tolower(*p);
 	}
 	return s;