diff --git a/Changes b/Changes
index 9ac88974c..7d47bf0ce 100644
--- a/Changes
+++ b/Changes
@@ -496,3 +496,5 @@
 - Added sendto_chanops_butone because of codemastr's laziness
 - Fixed a few +u bugs 
 - Fixed a +I bug (yes another one)
+- Changed channel.c so that when an opped non +q/+a Oper kicks a user who
+  is +q/+a it invokes an OperKick (patch by llthangel)
diff --git a/src/channel.c b/src/channel.c
index 4ee94c05a..c379836ac 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -3293,7 +3293,16 @@ int  m_kick(cptr, sptr, parc, parv)
 				if (is_chanprot(who, chptr)
 				    || is_chanowner(who, chptr)
 				    || IsServices(who))
-					if (!IsULine(cptr, sptr) && who != sptr)
+					if IsOper(sptr)
+					{ /* IRCop kicking owner/prot */
+						sendto_umode(UMODE_EYES,
+						    "*** OperKick [%s @ %s -> %s (%s)]",
+						    sptr->name,
+						    chptr->chname,
+						    who->name, comment);
+						goto attack;
+					}
+					else if (!IsULine(cptr, sptr) && who != sptr)
 					{
 						sendto_one(sptr,
 						    ":%s NOTICE %s :*** You cannot kick %s from %s because %s is channel protected",