diff --git a/PBot/AntiFlood.pm b/PBot/AntiFlood.pm
index 8f215a59..53565bf2 100644
--- a/PBot/AntiFlood.pm
+++ b/PBot/AntiFlood.pm
@@ -134,31 +134,27 @@ sub check_join_watch {
   my $channel_data = $self->{pbot}->{messagehistory}->{database}->get_channel_data($account, $channel, 'join_watch');
 
   if($mode == $self->{pbot}->{messagehistory}->{MSG_JOIN}) {
-    if($text =~ /^JOIN/) {
-      $channel_data->{join_watch}++;
-      #$self->{pbot}->logger->log("Join watch incremented to $channel_data->{join_watch} for $account\n");
-      $self->{pbot}->{messagehistory}->{database}->update_channel_data($account, $channel, $channel_data);
+    $channel_data->{join_watch}++;
+    $self->{pbot}->{messagehistory}->{database}->update_channel_data($account, $channel, $channel_data);
+  } elsif($mode == $self->{pbot}->{messagehistory}->{MSG_DEPARTURE}) {
+    # PART or QUIT
+    # check QUIT message for netsplits, and decrement joinwatch to allow a free rejoin
+    if($text =~ /^QUIT .*\.net .*\.split/) {
+      if($channel_data->{join_watch} > 0) {
+        $channel_data->{join_watch}--; 
+        $self->{pbot}->{messagehistory}->{database}->update_channel_data($account, $channel, $channel_data);
+      }
+    }
+    # check QUIT message for Ping timeout or Excess Flood
+    elsif($text =~ /^QUIT Ping timeout/ or $text =~ /^QUIT Excess Flood/) {
+      # ignore these (used to treat aggressively)
     } else {
-      # PART or QUIT
-      # check QUIT message for netsplits, and decrement joinwatch to allow a free rejoin
-      if($text =~ /^QUIT .*\.net .*\.split/) {
-        if($channel_data->{join_watch} > 0) {
-          $channel_data->{join_watch}--; 
-          $self->{pbot}->{messagehistory}->{database}->update_channel_data($account, $channel, $channel_data);
-        }
-      }
-      # check QUIT message for Ping timeout or Excess Flood
-      elsif($text =~ /^QUIT Ping timeout/ or $text =~ /^QUIT Excess Flood/) {
-        # ignore these (used to treat aggressively)
-      } else {
-        # some other type of QUIT or PART
-      }
+      # some other type of QUIT or PART
     }
   } elsif($mode == $self->{pbot}->{messagehistory}->{MSG_CHAT}) {
     # reset joinwatch if they send a message
     if($channel_data->{join_watch} > 0) {
       $channel_data->{join_watch} = 0;
-      #$self->{pbot}->logger->log("Join watch reset for $account\n");
       $self->{pbot}->{messagehistory}->{database}->update_channel_data($account, $channel, $channel_data);
     }
   }
@@ -176,7 +172,7 @@ sub check_flood {
   # handle QUIT events
   # (these events come from $channel nick!user@host, not a specific channel or nick,
   # so they need to be dispatched to all channels the nick has been seen on)
-  if($mode == $self->{pbot}->{messagehistory}->{MSG_JOIN} and $text =~ /^QUIT/) {
+  if($mode == $self->{pbot}->{messagehistory}->{MSG_DEPARTURE} and $text =~ /^QUIT/) {
     my @channels = $self->{pbot}->{messagehistory}->{database}->get_channels($account);
     foreach my $chan (@channels) {
       $self->check_join_watch($account, $chan, $text, $mode);
@@ -198,7 +194,7 @@ sub check_flood {
   # do not do flood processing if channel is not in bot's channel list or bot is not set as chanop for the channel
   return if ($channel =~ /^#/) and (not exists $self->{pbot}->channels->channels->hash->{$channel} or $self->{pbot}->channels->channels->hash->{$channel}{chanop} == 0);
 
-  if($channel =~ /^#/ and $mode == $self->{pbot}->{messagehistory}->{MSG_JOIN} and $text =~ /^PART/) {
+  if($channel =~ /^#/ and $mode == $self->{pbot}->{messagehistory}->{MSG_DEPARTURE}) {
     # remove validation on PART so we check for ban-evasion when user returns at a later time
     my $channel_data = $self->{pbot}->{messagehistory}->{database}->get_channel_data($account, $channel, 'validated');
     if($channel_data->{validated} & $self->{NICKSERV_VALIDATED}) {
@@ -214,7 +210,7 @@ sub check_flood {
 
   # check for ban evasion if channel begins with # (not private message) and hasn't yet been validated against ban evasion
   if($channel =~ m/^#/ and not $self->{pbot}->{messagehistory}->{database}->get_channel_data($account, $channel, 'validated')->{'validated'} & $self->{NICKSERV_VALIDATED}) {
-    if($mode == $self->{pbot}->{messagehistory}->{MSG_JOIN} and $text =~ /^PART/) {
+    if($mode == $self->{pbot}->{messagehistory}->{MSG_DEPARTURE}) {
       # don't check for evasion on PARTs
     } else {
       $self->{pbot}->conn->whois($nick);
@@ -228,6 +224,7 @@ sub check_flood {
     return;
   } 
 
+  # check for enter abuse
   if($mode == $self->{pbot}->{messagehistory}->{MSG_CHAT} and $channel =~ m/^#/) {
     my $channel_data = $self->{pbot}->{messagehistory}->{database}->get_channel_data($account, $channel, 'enter_abuse', 'enter_abuses');
 
@@ -268,6 +265,7 @@ sub check_flood {
     }
   }
 
+  # check for chat/join/private message flooding
   if($max_messages > 0 and $self->{pbot}->{messagehistory}->{database}->get_max_messages($account, $channel) >= $max_messages) {
     my $msg;
     if($mode == $self->{pbot}->{messagehistory}->{MSG_CHAT}) {
@@ -277,6 +275,10 @@ sub check_flood {
       my $joins = $self->{pbot}->{messagehistory}->{database}->get_recent_messages($account, $channel, $max_messages, $self->{pbot}->{messagehistory}->{MSG_JOIN});
       $msg = $joins->[0];
     }
+    elsif($mode == $self->{pbot}->{messagehistory}->{MSG_DEPARTURE}) {
+      # no flood checks to be done for departure events
+      return;
+    }
     else {
       $self->{pbot}->logger->log("Unknown flood mode [$mode] ... aborting flood enforcement.\n");
       return;
diff --git a/PBot/IRCHandlers.pm b/PBot/IRCHandlers.pm
index ab9881ff..2bc7f044 100644
--- a/PBot/IRCHandlers.pm
+++ b/PBot/IRCHandlers.pm
@@ -201,13 +201,13 @@ sub on_departure {
     # QUIT messages must be dispatched to each channel the user is on
     my @channels = $self->{pbot}->{messagehistory}->{database}->get_channels($message_account);
     foreach my $chan (@channels) {
-      $self->{pbot}->{messagehistory}->add_message($message_account, "$nick!$user\@$host", $chan, $text, $self->{pbot}->{messagehistory}->{MSG_JOIN});
+      $self->{pbot}->{messagehistory}->add_message($message_account, "$nick!$user\@$host", $chan, $text, $self->{pbot}->{messagehistory}->{MSG_DEPARTURE});
     }
   } else {
-    $self->{pbot}->{messagehistory}->add_message($message_account, "$nick!$user\@$host", $channel, $text, $self->{pbot}->{messagehistory}->{MSG_JOIN});
+    $self->{pbot}->{messagehistory}->add_message($message_account, "$nick!$user\@$host", $channel, $text, $self->{pbot}->{messagehistory}->{MSG_DEPARTURE});
   }
 
-  $self->{pbot}->antiflood->check_flood($channel, $nick, $user, $host, $text, 4, 60 * 30, $self->{pbot}->{messagehistory}->{MSG_JOIN});
+  $self->{pbot}->antiflood->check_flood($channel, $nick, $user, $host, $text, 4, 60 * 30, $self->{pbot}->{messagehistory}->{MSG_DEPARTURE});
 
   my $admin = $self->{pbot}->admins->find_admin($channel, "$nick!$user\@$host");
   if(defined $admin and $admin->{loggedin}) {
diff --git a/PBot/MessageHistory.pm b/PBot/MessageHistory.pm
index de50de3d..f7eef063 100644
--- a/PBot/MessageHistory.pm
+++ b/PBot/MessageHistory.pm
@@ -39,8 +39,9 @@ sub initialize {
   $self->{database}->begin();
   $self->{database}->devalidate_all_channels();
 
-  $self->{MSG_CHAT}   =  0;
-  $self->{MSG_JOIN}   =  1;
+  $self->{MSG_CHAT}      = 0;  # PRIVMSG, ACTION
+  $self->{MSG_JOIN}      = 1;  # JOIN
+  $self->{MSG_DEPARTURE} = 2;  # PART, QUIT, KICK
 
   $self->{pbot}->commands->register(sub { $self->recall_message(@_) },  "recall",  0);
 }
diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm
index 1bc13a8c..e08aecf8 100644
--- a/PBot/VERSION.pm
+++ b/PBot/VERSION.pm
@@ -13,7 +13,7 @@ use warnings;
 # These are set automatically by the build/commit script
 use constant {
   BUILD_NAME     => "PBot",
-  BUILD_REVISION => 573,
+  BUILD_REVISION => 574,
   BUILD_DATE     => "2014-05-14",
 };