diff -ur ircd-ratbox-3.0.6/src/match.c ircd-ratbox-3.0.6.dfsg/src/match.c
--- ircd-ratbox-3.0.6/src/match.c	2008-09-19 18:33:46.000000000 +0300
+++ ircd-ratbox-3.0.6.dfsg/src/match.c	2013-01-29 23:43:48.000000000 +0200
@@ -831,133 +831,133 @@
 /* | */ PRINT_C | ALPHA_C | NICK_C | CHAN_C | NONEOS_C | USER_C,
 /* } */ PRINT_C | ALPHA_C | NICK_C | CHAN_C | NONEOS_C | USER_C,
 /* ~ */ PRINT_C | ALPHA_C | CHAN_C | NONEOS_C | USER_C,
-/* del  */ CHAN_C | NONEOS_C,
-/* 0x80 */ CHAN_C | NONEOS_C,
-/* 0x81 */ CHAN_C | NONEOS_C,
-/* 0x82 */ CHAN_C | NONEOS_C,
-/* 0x83 */ CHAN_C | NONEOS_C,
-/* 0x84 */ CHAN_C | NONEOS_C,
-/* 0x85 */ CHAN_C | NONEOS_C,
-/* 0x86 */ CHAN_C | NONEOS_C,
-/* 0x87 */ CHAN_C | NONEOS_C,
-/* 0x88 */ CHAN_C | NONEOS_C,
-/* 0x89 */ CHAN_C | NONEOS_C,
-/* 0x8A */ CHAN_C | NONEOS_C,
-/* 0x8B */ CHAN_C | NONEOS_C,
-/* 0x8C */ CHAN_C | NONEOS_C,
-/* 0x8D */ CHAN_C | NONEOS_C,
-/* 0x8E */ CHAN_C | NONEOS_C,
-/* 0x8F */ CHAN_C | NONEOS_C,
-/* 0x90 */ CHAN_C | NONEOS_C,
-/* 0x91 */ CHAN_C | NONEOS_C,
-/* 0x92 */ CHAN_C | NONEOS_C,
-/* 0x93 */ CHAN_C | NONEOS_C,
-/* 0x94 */ CHAN_C | NONEOS_C,
-/* 0x95 */ CHAN_C | NONEOS_C,
-/* 0x96 */ CHAN_C | NONEOS_C,
-/* 0x97 */ CHAN_C | NONEOS_C,
-/* 0x98 */ CHAN_C | NONEOS_C,
-/* 0x99 */ CHAN_C | NONEOS_C,
-/* 0x9A */ CHAN_C | NONEOS_C,
-/* 0x9B */ CHAN_C | NONEOS_C,
-/* 0x9C */ CHAN_C | NONEOS_C,
-/* 0x9D */ CHAN_C | NONEOS_C,
-/* 0x9E */ CHAN_C | NONEOS_C,
-/* 0x9F */ CHAN_C | NONEOS_C,
-/* 0xA0 */ CHAN_C | FCHAN_C | NONEOS_C,
-/* 0xA1 */ CHAN_C | NONEOS_C,
-/* 0xA2 */ CHAN_C | NONEOS_C,
-/* 0xA3 */ CHAN_C | NONEOS_C,
-/* 0xA4 */ CHAN_C | NONEOS_C,
-/* 0xA5 */ CHAN_C | NONEOS_C,
-/* 0xA6 */ CHAN_C | NONEOS_C,
-/* 0xA7 */ CHAN_C | NONEOS_C,
-/* 0xA8 */ CHAN_C | NONEOS_C,
-/* 0xA9 */ CHAN_C | NONEOS_C,
-/* 0xAA */ CHAN_C | NONEOS_C,
-/* 0xAB */ CHAN_C | NONEOS_C,
-/* 0xAC */ CHAN_C | NONEOS_C,
-/* 0xAD */ CHAN_C | NONEOS_C,
-/* 0xAE */ CHAN_C | NONEOS_C,
-/* 0xAF */ CHAN_C | NONEOS_C,
-/* 0xB0 */ CHAN_C | NONEOS_C,
-/* 0xB1 */ CHAN_C | NONEOS_C,
-/* 0xB2 */ CHAN_C | NONEOS_C,
-/* 0xB3 */ CHAN_C | NONEOS_C,
-/* 0xB4 */ CHAN_C | NONEOS_C,
-/* 0xB5 */ CHAN_C | NONEOS_C,
-/* 0xB6 */ CHAN_C | NONEOS_C,
-/* 0xB7 */ CHAN_C | NONEOS_C,
-/* 0xB8 */ CHAN_C | NONEOS_C,
-/* 0xB9 */ CHAN_C | NONEOS_C,
-/* 0xBA */ CHAN_C | NONEOS_C,
-/* 0xBB */ CHAN_C | NONEOS_C,
-/* 0xBC */ CHAN_C | NONEOS_C,
-/* 0xBD */ CHAN_C | NONEOS_C,
-/* 0xBE */ CHAN_C | NONEOS_C,
-/* 0xBF */ CHAN_C | NONEOS_C,
-/* 0xC0 */ CHAN_C | NONEOS_C,
-/* 0xC1 */ CHAN_C | NONEOS_C,
-/* 0xC2 */ CHAN_C | NONEOS_C,
-/* 0xC3 */ CHAN_C | NONEOS_C,
-/* 0xC4 */ CHAN_C | NONEOS_C,
-/* 0xC5 */ CHAN_C | NONEOS_C,
-/* 0xC6 */ CHAN_C | NONEOS_C,
-/* 0xC7 */ CHAN_C | NONEOS_C,
-/* 0xC8 */ CHAN_C | NONEOS_C,
-/* 0xC9 */ CHAN_C | NONEOS_C,
-/* 0xCA */ CHAN_C | NONEOS_C,
-/* 0xCB */ CHAN_C | NONEOS_C,
-/* 0xCC */ CHAN_C | NONEOS_C,
-/* 0xCD */ CHAN_C | NONEOS_C,
-/* 0xCE */ CHAN_C | NONEOS_C,
-/* 0xCF */ CHAN_C | NONEOS_C,
-/* 0xD0 */ CHAN_C | NONEOS_C,
-/* 0xD1 */ CHAN_C | NONEOS_C,
-/* 0xD2 */ CHAN_C | NONEOS_C,
-/* 0xD3 */ CHAN_C | NONEOS_C,
-/* 0xD4 */ CHAN_C | NONEOS_C,
-/* 0xD5 */ CHAN_C | NONEOS_C,
-/* 0xD6 */ CHAN_C | NONEOS_C,
-/* 0xD7 */ CHAN_C | NONEOS_C,
-/* 0xD8 */ CHAN_C | NONEOS_C,
-/* 0xD9 */ CHAN_C | NONEOS_C,
-/* 0xDA */ CHAN_C | NONEOS_C,
-/* 0xDB */ CHAN_C | NONEOS_C,
-/* 0xDC */ CHAN_C | NONEOS_C,
-/* 0xDD */ CHAN_C | NONEOS_C,
-/* 0xDE */ CHAN_C | NONEOS_C,
-/* 0xDF */ CHAN_C | NONEOS_C,
-/* 0xE0 */ CHAN_C | NONEOS_C,
-/* 0xE1 */ CHAN_C | NONEOS_C,
-/* 0xE2 */ CHAN_C | NONEOS_C,
-/* 0xE3 */ CHAN_C | NONEOS_C,
-/* 0xE4 */ CHAN_C | NONEOS_C,
-/* 0xE5 */ CHAN_C | NONEOS_C,
-/* 0xE6 */ CHAN_C | NONEOS_C,
-/* 0xE7 */ CHAN_C | NONEOS_C,
-/* 0xE8 */ CHAN_C | NONEOS_C,
-/* 0xE9 */ CHAN_C | NONEOS_C,
-/* 0xEA */ CHAN_C | NONEOS_C,
-/* 0xEB */ CHAN_C | NONEOS_C,
-/* 0xEC */ CHAN_C | NONEOS_C,
-/* 0xED */ CHAN_C | NONEOS_C,
-/* 0xEE */ CHAN_C | NONEOS_C,
-/* 0xEF */ CHAN_C | NONEOS_C,
-/* 0xF0 */ CHAN_C | NONEOS_C,
-/* 0xF1 */ CHAN_C | NONEOS_C,
-/* 0xF2 */ CHAN_C | NONEOS_C,
-/* 0xF3 */ CHAN_C | NONEOS_C,
-/* 0xF4 */ CHAN_C | NONEOS_C,
-/* 0xF5 */ CHAN_C | NONEOS_C,
-/* 0xF6 */ CHAN_C | NONEOS_C,
-/* 0xF7 */ CHAN_C | NONEOS_C,
-/* 0xF8 */ CHAN_C | NONEOS_C,
-/* 0xF9 */ CHAN_C | NONEOS_C,
-/* 0xFA */ CHAN_C | NONEOS_C,
-/* 0xFB */ CHAN_C | NONEOS_C,
-/* 0xFC */ CHAN_C | NONEOS_C,
-/* 0xFD */ CHAN_C | NONEOS_C,
-/* 0xFE */ CHAN_C | NONEOS_C,
-/* 0xFF */ CHAN_C | NONEOS_C
+/* del  */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x80 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x81 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x82 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x83 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x84 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x85 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x86 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x87 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x88 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x89 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x8A */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x8B */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x8C */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x8D */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x8E */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x8F */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x90 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x91 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x92 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x93 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x94 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x95 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x96 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x97 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x98 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x99 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x9A */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x9B */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x9C */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x9D */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x9E */ CHAN_C | NICK_C | NONEOS_C,
+/* 0x9F */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xA0 */ CHAN_C | NICK_C | FCHAN_C | NONEOS_C,
+/* 0xA1 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xA2 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xA3 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xA4 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xA5 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xA6 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xA7 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xA8 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xA9 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xAA */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xAB */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xAC */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xAD */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xAE */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xAF */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xB0 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xB1 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xB2 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xB3 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xB4 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xB5 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xB6 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xB7 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xB8 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xB9 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xBA */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xBB */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xBC */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xBD */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xBE */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xBF */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xC0 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xC1 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xC2 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xC3 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xC4 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xC5 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xC6 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xC7 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xC8 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xC9 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xCA */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xCB */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xCC */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xCD */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xCE */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xCF */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xD0 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xD1 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xD2 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xD3 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xD4 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xD5 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xD6 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xD7 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xD8 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xD9 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xDA */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xDB */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xDC */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xDD */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xDE */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xDF */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xE0 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xE1 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xE2 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xE3 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xE4 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xE5 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xE6 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xE7 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xE8 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xE9 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xEA */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xEB */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xEC */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xED */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xEE */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xEF */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xF0 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xF1 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xF2 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xF3 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xF4 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xF5 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xF6 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xF7 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xF8 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xF9 */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xFA */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xFB */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xFC */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xFD */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xFE */ CHAN_C | NICK_C | NONEOS_C,
+/* 0xFF */ CHAN_C | NICK_C | NONEOS_C
 };