diff --git a/Changes b/Changes
index 657a2d233..8a54a2e7c 100644
--- a/Changes
+++ b/Changes
@@ -9,6 +9,7 @@ Anope Version  S V N
 01/06 F MySQL code not always reporting Services Root flags correctly.    [#659]
 01/10 F Minor syntax error in anoperc.                                    [#665]
 01/10 F CHAN_SYMBOL_REQUIRED claimed one can register local (&) channels. [#666]
+01/10 F BotServ kicks now obeys the channel's SignKick option.            [#663]
 
 Anope Version 1.7.18
 --------------------
diff --git a/src/botserv.c b/src/botserv.c
index 1b6f98eb0..2d72030f9 100644
--- a/src/botserv.c
+++ b/src/botserv.c
@@ -947,7 +947,15 @@ void bot_raw_ban(User * requester, ChannelInfo * ci, char *nick,
         av[2] = reason;
     }
 
-    anope_cmd_kick(ci->bi->nick, av[0], av[1], "%s", av[2]);
+    /* Check if we need to do a signkick or not -GD */
+    if ((ci->flags & CI_SIGNKICK)
+        || ((ci->flags & CI_SIGNKICK_LEVEL)
+            && !check_access(requester, ci, CA_SIGNKICK)))
+        anope_cmd_kick(ci->bi->nick, av[0], av[1], "%s (%s)", av[2],
+                       requester->nick);
+    else
+        anope_cmd_kick(ci->bi->nick, av[0], av[1], "%s", av[2]);
+
     do_kick(ci->bi->nick, 3, av);
 }
 
@@ -987,7 +995,13 @@ void bot_raw_kick(User * requester, ChannelInfo * ci, char *nick,
         av[2] = reason;
     }
 
-    anope_cmd_kick(ci->bi->nick, av[0], av[1], "%s", av[2]);
+    if ((ci->flags & CI_SIGNKICK)
+        || ((ci->flags & CI_SIGNKICK_LEVEL)
+            && !check_access(requester, ci, CA_SIGNKICK)))
+        anope_cmd_kick(ci->bi->nick, av[0], av[1], "%s (%s)", av[2],
+                       requester->nick);
+    else
+        anope_cmd_kick(ci->bi->nick, av[0], av[1], "%s", av[2]);
     do_kick(ci->bi->nick, 3, av);
 }
 
diff --git a/version.log b/version.log
index 405907d87..2aea3c543 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="18"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1223"
+VERSION_BUILD="1224"
 
 # $Log$
 #
+# BUILD : 1.7.18 (1224)
+# BUGS  : 663
+# NOTES : Fixed BotServ kicks to now obey the SignKick setting of the channel
+#
 # BUILD : 1.7.18 (1223)
 # BUGS  : 666
 # NOTES : Fixed CHAN_SYMBOL_REQUIRED which claimed one can register local (&) channels (sorry Rob, i should have left this bug for you)