diff --git a/ChangeLog b/ChangeLog
index c80e3b3c..b10931be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -96,7 +96,8 @@ Borreli, blotus:
    * [7cd6dab] Added help command to fail2ban-client.
    * [c8c7b0b,23bbc60] Better logging of log file read errors.
    * [3665e6d] Added code coverage to development process.
-   * [41b9f7b,32d10e9] More complete ssh filter rules to match openssh source.
+   * [41b9f7b,32d10e9,39750b8] More complete ssh filter rules to match openssh
+	   source. Also include BSD changes.
    * [1d9abd1] Action files can have tags in definition that refer to other
      tags.
   Pascal Borreli
diff --git a/config/filter.d/sshd.conf b/config/filter.d/sshd.conf
index 4138a9c4..52a61523 100644
--- a/config/filter.d/sshd.conf
+++ b/config/filter.d/sshd.conf
@@ -22,7 +22,7 @@ _daemon = sshd
 #          (?:::f{4,6}:)?(?P<host>[\w\-.^_]+)
 # Values:  TEXT
 #
-failregex = ^%(__prefix_line)s(?:error: PAM: )?Authentication failure for .* from <HOST>\s*$
+failregex = ^%(__prefix_line)s(?:error: PAM: )?[A|a]uthentication (?:failure|error) for .* from <HOST>\s*$
             ^%(__prefix_line)s(?:error: PAM: )?User not known to the underlying authentication module for .* from <HOST>\s*$
             ^%(__prefix_line)sFailed \S+ for .* from <HOST>(?: port \d*)?(?: ssh\d*)?\s*$
             ^%(__prefix_line)sROOT LOGIN REFUSED.* FROM <HOST>\s*$