diff --git a/ChangeLog b/ChangeLog
index 85b1867b..42faaa5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,8 @@ ver. 1.1.1-dev-1 (20??/??/??) - development nightly edition
* `filter.d/freeswitch.conf` - bypass some new info in prefix before [WARNING] (changed default `_pref_line`),
FreeSWITCH log line prefix has changed in newer versions (gh-3143)
* `filter.d/postfix.conf` - consider CONNECT and other rejected commands as a valid `_pref` (gh-3800)
+* `filter.d/dropbear.conf`:
+ - recognizes extra pid/timestamp if logged into stdout/journal, added `journalmatch` (gh-3597)
* `filter.d/recidive.conf` - restore possibility to set jail name in the filter, _jailname is positive now (gh-3769)
* `filter.d/roundcube-auth.conf` - improved RE better matching log format of roundcube version 1.4+ (gh-3816)
* `filter.d/sshd.conf`:
diff --git a/config/filter.d/dropbear.conf b/config/filter.d/dropbear.conf
index 930bb128..b5329555 100644
--- a/config/filter.d/dropbear.conf
+++ b/config/filter.d/dropbear.conf
@@ -23,7 +23,7 @@ before = common.conf
_daemon = dropbear
-prefregex = ^%(__prefix_line)s(?:[Ll]ogin|[Bb]ad|[Ee]xit).+$
+prefregex = ^%(__prefix_line)s(?:\[\d+\] \w{2,3} [\d:\s]+)?(?:[Ll]ogin|[Bb]ad|[Ee]xit).+$
failregex = ^[Ll]ogin attempt for nonexistent user ('.*' )?from :\d+$
^[Bb]ad (PAM )?password attempt for .+ from (:\d+)?$
@@ -31,6 +31,8 @@ failregex = ^[Ll]ogin attempt for nonexistent user ('.*' )?from :\d+$
ignoreregex =
+journalmatch = _SYSTEMD_UNIT=dropbear.service + _COMM=dropbear
+
# DEV Notes:
#
# The first two regexs here match the unmodified dropbear messages. It isn't
diff --git a/fail2ban/tests/files/logs/dropbear b/fail2ban/tests/files/logs/dropbear
index d8a4d4d3..c945e3af 100644
--- a/fail2ban/tests/files/logs/dropbear
+++ b/fail2ban/tests/files/logs/dropbear
@@ -13,3 +13,6 @@ Jul 27 01:04:12 fail2ban-test dropbear[1335]: Bad password attempt for 'root' fr
Jul 27 01:04:22 fail2ban-test dropbear[1335]: Exit before auth (user 'root', 10 fails): Max auth tries reached - user 'root' from 1.2.3.4:60588
# failJSON: { "time": "2005-07-27T01:18:59", "match": true , "host": "1.2.3.4" }
Jul 27 01:18:59 fail2ban-test dropbear[1477]: Login attempt for nonexistent user from 1.2.3.4:60794
+
+# failJSON: { "time": "2005-07-10T23:53:52", "match": true , "host": "1.2.3.4", "desc": "extra pid/timestamp may be logged into journal, gh-3597" }
+Jul 10 23:53:52 fail2ban-test dropbear[825]: [825] Jul 10 23:53:52 Bad password attempt for 'root' from 1.2.3.4:52289