diff --git a/irc/server.go b/irc/server.go
index 8fa3b6b4..384d0c76 100644
--- a/irc/server.go
+++ b/irc/server.go
@@ -100,7 +100,7 @@ func NewServer(config *Config) *Server {
 	}
 
 	//TODO(dan): Hot damn this is an ugly hack. Fix it properly at some point.
-	ChannelNameExpr = regexp.MustCompile(fmt.Sprintf(`^[#][\pL\pN]{1,%d}$`, config.Limits.ChannelLen))
+	ChannelNameExpr = regexp.MustCompile(fmt.Sprintf(`^[#][\pL\pN\pP\pS]{1,%d}$`, config.Limits.ChannelLen))
 	NicknameExpr = regexp.MustCompile(fmt.Sprintf("^[\\pL\\pN\\pP\\pS]{1,%d}$", config.Limits.NickLen))
 
 	if config.Server.Password != "" {