diff --git a/modules/core/m_mode.c b/modules/core/m_mode.c
index 13beb1c..391fc82 100644
--- a/modules/core/m_mode.c
+++ b/modules/core/m_mode.c
@@ -274,7 +274,7 @@ ms_bmask(struct Client *client_p, struct Client *source_p, int parc, const char
         mems = ONLY_CHANOPS;
         break;
 
-    case 'q':
+    case 'y':
         banlist = &chptr->quietlist;
         mode_type = CHFL_QUIET;
         mems = ALL_MEMBERS;
diff --git a/src/chmode.c b/src/chmode.c
index 750e51e..ed43adb 100644
--- a/src/chmode.c
+++ b/src/chmode.c
@@ -147,7 +147,7 @@ construct_cflag_param_string(void)
                 ConfigChannel.use_forward ? "f" : "",
                 ConfigChannel.use_halfop ? "h" : "",
                 strchr(ConfigChannel.disabledmodes, 'j') ? "" : "j",
-                strchr(ConfigChannel.disabledmodes, 'q') ? "" : "q",
+                strchr(ConfigChannel.disabledmodes, 'y') ? "" : "y",
                 ConfigChannel.use_invex ? "I" : "");
 }
 
@@ -1874,7 +1874,7 @@ struct ChannelMode chmode_table[256] = {
     {chm_voice,	0 },			/* v */
     {chm_nosuch,	0 },			/* w */
     {chm_nosuch,	0 },			/* x */
-    {chm_nosuch,   0 },    		/* y */
+    {chm_ban,	CHFL_QUIET },		/* y */
     {chm_simple,	MODE_OPMODERATE },	/* z */
 
     {chm_nosuch,  0 },			/* 0x7b */
diff --git a/src/messages.tab b/src/messages.tab
index dfc5e54..60ed2b4 100644
--- a/src/messages.tab
+++ b/src/messages.tab
@@ -749,8 +749,8 @@ static  const char *  replies[] = {
 /* 725 RPL_TESTLINE */		":%s 725 %s %c %ld %s :%s",
 /* 726 RPL_NOTESTLINE */	":%s 726 %s %s :No matches",
 /* 727 RPL_TESTMASKGECOS */     ":%s 727 %s %d %d %s!%s@%s %s :Local/remote clients match",
-/* 728 RPL_QUIETLIST */		":%s 728 %s %s q %s %s %lu",
-/* 729 RPL_ENDOFQUIETLIST */ ":%s 729 %s %s q :End of Channel Quiet List",
+/* 728 RPL_QUIETLIST */		":%s 728 %s %s y %s %s %lu",
+/* 729 RPL_ENDOFQUIETLIST */ ":%s 729 %s %s y :End of Channel Quiet List",
 /* 730 RPL_MONONLINE */		":%s 730 %s :%s",
 /* 731 RPL_MONOFFLINE */	":%s 731 %s :%s",
 /* 732 RPL_MONLIST */		":%s 732 %s :%s",
diff --git a/src/s_conf.c b/src/s_conf.c
index b71b1e6..1a6fc8b 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -947,8 +947,8 @@ validate_conf(void)
                 cflag_orphan('Q');
                 continue;
             }
-            if(*dm == 'q') {
-                cflag_orphan('q');
+            if(*dm == 'y') {
+                cflag_orphan('y');
                 continue;
             }
             if(*dm == 'I') {
diff --git a/src/s_serv.c b/src/s_serv.c
index 8d44855..8db08cc 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -658,7 +658,7 @@ burst_TS6(struct Client *client_p)
             burst_modes_TS6(client_p, chptr, &chptr->invexlist, 'I');
 
         if(rb_dlink_list_length(&chptr->quietlist) > 0)
-            burst_modes_TS6(client_p, chptr, &chptr->quietlist, 'q');
+            burst_modes_TS6(client_p, chptr, &chptr->quietlist, 'y');
 
         if(IsCapable(client_p, CAP_TB) && chptr->topic != NULL)
             sendto_one(client_p, ":%s TB %s %ld %s%s:%s",
diff --git a/src/supported.c b/src/supported.c
index 0dbb578..5ca84f6 100644
--- a/src/supported.c
+++ b/src/supported.c
@@ -222,7 +222,7 @@ isupport_chanmodes(const void *ptr)
     rb_snprintf(result, sizeof result, "%s%sb%s,k,%sl%s,%s",
                 ConfigChannel.use_except ? "e" : "",
                 ConfigChannel.use_invex ? "I" : "",
-                strchr(ConfigChannel.disabledmodes, 'q') ? "" : "q",
+                strchr(ConfigChannel.disabledmodes, 'y') ? "" : "y",
                 ConfigChannel.use_forward ? "f" : "",
                 strchr(ConfigChannel.disabledmodes, 'j') ? "" : "j",
                 cflagsbuf);