diff --git a/ChangeLog b/ChangeLog
index a80e610a..c748972e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@ Fail2Ban (version 0.8.4)                           2008/??/??
 
 ver. 0.8.4 (2008/??/??) - stable
 ----------
+- Merged patches from Debian package. Thanks to Yaroslav
+  Halchenko.
 
 ver. 0.8.3 (2008/07/17) - stable
 ----------
diff --git a/config/filter.d/sshd.conf b/config/filter.d/sshd.conf
index 9a7c851a..642f2bf7 100644
--- a/config/filter.d/sshd.conf
+++ b/config/filter.d/sshd.conf
@@ -24,7 +24,8 @@ _daemon = sshd
 # Values:  TEXT
 #
 failregex = ^%(__prefix_line)s(?:error: PAM: )?Authentication failure for .* from <HOST>\s*$
-            ^%(__prefix_line)sFailed [-/\w]+ for .* from <HOST>(?: port \d*)?(?: ssh\d*)?$
+            ^%(__prefix_line)s(?:error: PAM: )?User not known to the underlying authentication module for .* from <HOST>\s*$
+            ^%(__prefix_line)sFailed (?:password|publickey) for .* from <HOST>(?: port \d*)?(?: ssh\d*)?$
             ^%(__prefix_line)sROOT LOGIN REFUSED.* FROM <HOST>\s*$
             ^%(__prefix_line)s[iI](?:llegal|nvalid) user .* from <HOST>\s*$
             ^%(__prefix_line)sUser \S+ from <HOST> not allowed because not listed in AllowUsers$