diff --git a/Changes b/Changes
index f36ef8d92..13d3ed2d3 100644
--- a/Changes
+++ b/Changes
@@ -87,4 +87,5 @@
 - Added listen {} runtime-configuration code work :))
 - Removed unrealircd.conf from the stock
 - X:line was replaced with drpass {} in /restart and /die (will make them faster as well)
+- Made +u do a auditorium/star chat feature, suggested by |Martin|=======
 - Fixed a G:line bug that would allow certain masks to be interpreted as *@*
diff --git a/src/channel.c b/src/channel.c
index 0b92532fd..e68c5ef27 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -626,7 +626,7 @@ int  can_send(cptr, chptr, msgtext)
 {
 	Link *lp;
 	int  member;
-
+	static char tempbuf[1500];
 	/* Moved check here, kinda faster.
 	 * Note IsULine only uses the other parameter. -Donwulff */
 	if (IsULine(cptr) || IsServer(cptr))
@@ -647,7 +647,18 @@ int  can_send(cptr, chptr, msgtext)
 	    (!lp
 	    || !(lp->flags & (CHFL_CHANOP | CHFL_VOICE | CHFL_CHANOWNER |
 	    CHFL_HALFOP | CHFL_CHANPROT))))
-		return (CANNOT_SEND_MODERATED);
+	    {
+		if (!(chptr->mode.mode & MODE_AUDITORIUM))
+		{
+			return (CANNOT_SEND_MODERATED);
+		} 
+		{
+			sendto_chanops_butone(cptr, chptr, ":IRC PRIVMSG %s :%s: %s",
+					chptr->chname, cptr->name,
+					msgtext);
+			return (CANNOT_SEND_MODERATED);
+		}
+	    }
 
 	if (chptr->mode.mode & MODE_NOCTCP &&
 	    (!lp