diff --git a/PBot/AntiFlood.pm b/PBot/AntiFlood.pm
index 9f9ce5d8..9229ebbe 100644
--- a/PBot/AntiFlood.pm
+++ b/PBot/AntiFlood.pm
@@ -182,6 +182,8 @@ sub prune_message_history {
   foreach my $nick (keys %{ $self->{message_history} }) {
     foreach my $channel (keys %{ $self->{message_history}->{$nick} })
     {
+      next if $channel eq 'hostmask'; # TODO: move channels into {channel} subkey
+
       #$self->{pbot}->logger->log("Checking [$nick][$channel]\n");
       my $length = $#{ $self->{message_history}->{$nick}{$channel}{messages} } + 1;
       my %last = %{ @{ $self->{message_history}->{$nick}{$channel}{messages} }[$length - 1] };
diff --git a/PBot/FactoidCommands.pm b/PBot/FactoidCommands.pm
index 8e8cf802..53943be6 100644
--- a/PBot/FactoidCommands.pm
+++ b/PBot/FactoidCommands.pm
@@ -79,6 +79,7 @@ sub list {
       foreach my $history_nick (keys %{ $self->{pbot}->antiflood->message_history }) {
         if($history_nick =~ m/$nick_search/i) {
           foreach my $history_channel (keys %{ $self->{pbot}->antiflood->message_history->{$history_nick} }) {
+            next if $history_channel eq 'hostmask'; # TODO: move channels into {channel} subkey
             if($history_channel =~ m/$channel_search/i) {
               my @messages = @{ ${ $self->{pbot}->antiflood->message_history }{$history_nick}{$history_channel}{messages} };
 
diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm
index 3de75547..98e8974c 100644
--- a/PBot/VERSION.pm
+++ b/PBot/VERSION.pm
@@ -13,8 +13,8 @@ use warnings;
 # These are set automatically by the build/commit script
 use constant {
   BUILD_NAME     => "PBot",
-  BUILD_REVISION => 150,
-  BUILD_DATE     => "2010-06-05",
+  BUILD_REVISION => 151,
+  BUILD_DATE     => "2010-06-06",
 };
 
 1;