diff --git a/extensions/Makefile.in b/extensions/Makefile.in
index 1c234eb..2b80314 100644
--- a/extensions/Makefile.in
+++ b/extensions/Makefile.in
@@ -46,6 +46,7 @@ SRCS =                          \
   force_user_invis.c		\
   hurt.c			\
   ip_cloaking.c			\
+  make_override_immune.c	\
   sno_farconnect.c		\
   sno_globalkline.c		\
   sno_globaloper.c		\
diff --git a/extensions/make_override_immune.c b/extensions/make_override_immune.c
new file mode 100644
index 0000000..148b8d9
--- /dev/null
+++ b/extensions/make_override_immune.c
@@ -0,0 +1,36 @@
+#include "stdinc.h"
+#include "modules.h"
+#include "hook.h"
+#include "client.h"
+#include "ircd.h"
+#include "send.h"
+#include "numeric.h"
+#include "chmode.h"
+#include "s_newconf.h"
+
+static void can_kick(hook_data_channel_approval *);
+
+mapi_hfn_list_av1 nooperkick_hfnlist[] = {
+	{ "can_kick", (hookfn) can_kick },
+	{ NULL, NULL }
+};
+
+DECLARE_MODULE_AV1(chm_no_oper_kick, NULL, NULL, NULL, NULL, nooperkick_hfnlist, "$Revision$");
+
+static void
+can_kick(hook_data_channel_approval *data)
+{
+	struct Client *source_p = data->client;
+	struct Client *target_p = data->target;
+	struct Channel *chptr = data->chptr;
+
+	if (target_p->umodes & UMODE_OVERRIDE && data->approved)
+	{
+		sendto_one_numeric(source_p, ERR_ISCHANSERVICE,
+				"%s %s :User is immune from kick.",
+				target_p->name, chptr->chname);
+		sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Overriding KICK from %s on %s in %s (user is immune)",
+			source_p->name, target_p->name, chptr->chname);
+		data->approved = 0;
+	}
+}