diff --git a/Changes b/Changes
index abf2fae0b..169ea8b86 100644
--- a/Changes
+++ b/Changes
@@ -4,6 +4,7 @@ Provided by Anope Dev. <dev@anope.org> - 2005
 10/01 A Information on uplink server can be displayed via OperServ STATS. [ #00]
 09/29 A Configuration option to change fantasy command prefix character.  [ #00]
 09/28 A Event for fantasy commands triggered without channel access.      [ #00]
+10/01 F ChanServ HOP was available on IRCDs without halfop support.       [ #00]
 10/01 F Placed capab tokens and flags into a table for easier handling.   [ #00]
 10/01 F Capab parsing on hybrid/plexus/ratbox failed.                     [ #00]
 10/01 F Typo in example.conf (DevNullAlias was called DevNullName).       [ #00]
diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c
index 6209015a8..5d897538b 100644
--- a/src/core/cs_xop.c
+++ b/src/core/cs_xop.c
@@ -98,8 +98,10 @@ int AnopeInit(int argc, char **argv)
 
     c = createCommand("AOP", do_aop, NULL, CHAN_HELP_AOP, -1, -1, -1, -1);
     moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("HOP", do_hop, NULL, CHAN_HELP_HOP, -1, -1, -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+	if (ircd->halfop) {
+	    c = createCommand("HOP", do_hop, NULL, CHAN_HELP_HOP, -1, -1, -1, -1);
+    	moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+	}
     c = createCommand("SOP", do_sop, NULL, CHAN_HELP_SOP, -1, -1, -1, -1);
     moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
     c = createCommand("VOP", do_vop, NULL, CHAN_HELP_VOP, -1, -1, -1, -1);
diff --git a/version.log b/version.log
index 4b88e6dea..f31b2788f 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="11"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="908"
+VERSION_BUILD="909"
 
 # $Log$
 #
+# BUILD : 1.7.11 (909)
+# BUGS  : 
+# NOTES : Fixed /cs hop being available on ircds without halfop support
+#
 # BUILD : 1.7.11 (908)
 # BUGS  : 
 # NOTES : Created a CapabInfo table to allow easier handling of capab tokens/flags