diff --git a/Changes b/Changes
index 4b6d7f5de..70d79f031 100644
--- a/Changes
+++ b/Changes
@@ -16,6 +16,7 @@ Anope Version  S V N
 03/03 F SAs can no longer move other SAs down to ServicesOpers.           [#690]
 03/03 F We now send out UNKLINE on hybrid when /os akill del is issued.   [#656]
 03/14 F /os modunload dosnt clear moduleData before calling AnopeFini.    [ #00]
+03/18 F DefCon's AKILL will now honor the server's sync flag.             [#643]
 
 Anope Version 1.7.18
 --------------------
diff --git a/src/users.c b/src/users.c
index 11d8410b1..fb586e779 100644
--- a/src/users.c
+++ b/src/users.c
@@ -569,7 +569,8 @@ User *do_nick(const char *source, char *nick, char *username, char *host,
  * DefCon AKILL system, if we want to akill all connecting user's here's where to do it
  * then force check_akill again on them...
  **/
-        if (checkDefCon(DEFCON_AKILL_NEW_CLIENTS)) {
+        // don't akill on netmerges -Certus
+        if (is_sync(findserver(servlist, server)) && checkDefCon(DEFCON_AKILL_NEW_CLIENTS)) {
             strncpy(mask, "*@", 3);
             strncat(mask, host, HOSTMAX);
             alog("DEFCON: adding akill for %s", mask);
diff --git a/version.log b/version.log
index 9eca8842c..6a04fbc32 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="1234"
+VERSION_BUILD="1235"
 
 # $Log$
 #
+# BUILD : 1.7.18 (1235)
+# BUGS  : 643
+# NOTES : Defcon's AKILL will now honor the server's sync flag
+#
 # BUILD : 1.7.18 (1234)
 # BUGS  : 680 681
 # NOTES : typos in en_us.l