diff --git a/debian/freedombox.maintscript b/debian/freedombox.maintscript
index 49e3fb9ac..8f0d298fc 100644
--- a/debian/freedombox.maintscript
+++ b/debian/freedombox.maintscript
@@ -21,3 +21,5 @@ rm_conffile /etc/plinth/modules-enabled/mldonkey 22.4~
 rm_conffile /etc/apache2/conf-available/mldonkey-freedombox.conf 22.4~
 rm_conffile /etc/apache2/sites-available/plinth.conf 22.16~
 rm_conffile /etc/apache2/sites-available/plinth-ssl.conf 22.16~
+rm_conffile /etc/fail2ban/jail.d/wordpress-auth-freedombox.conf 22.22~
+rm_conffile /etc/fail2ban/filter.d/wordpress-auth-freedombox.conf 22.22~
diff --git a/plinth/modules/wordpress/data/etc/fail2ban/filter.d/wordpress-auth-freedombox.conf b/plinth/modules/wordpress/data/etc/fail2ban/filter.d/wordpress-auth-freedombox.conf
deleted file mode 100644
index 6942f7502..000000000
--- a/plinth/modules/wordpress/data/etc/fail2ban/filter.d/wordpress-auth-freedombox.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Definition]
-failregex = .* <HOST> .* "POST /wordpress/wp-login.php HTTP/\S+" 200
diff --git a/plinth/modules/wordpress/data/etc/fail2ban/filter.d/wordpress-freedombox.conf b/plinth/modules/wordpress/data/etc/fail2ban/filter.d/wordpress-freedombox.conf
new file mode 100644
index 000000000..44403b5eb
--- /dev/null
+++ b/plinth/modules/wordpress/data/etc/fail2ban/filter.d/wordpress-freedombox.conf
@@ -0,0 +1,7 @@
+[INCLUDES]
+before = common.conf
+
+[Definition]
+_daemon = apache-access
+prefregex = %(__prefix_line)s
+failregex = \S+ <HOST> - \S+ \[[^\]]*\] "POST /wordpress/wp-login.php HTTP/\S+" 200
diff --git a/plinth/modules/wordpress/data/etc/fail2ban/jail.d/wordpress-auth-freedombox.conf b/plinth/modules/wordpress/data/etc/fail2ban/jail.d/wordpress-auth-freedombox.conf
deleted file mode 100644
index 6323016c5..000000000
--- a/plinth/modules/wordpress/data/etc/fail2ban/jail.d/wordpress-auth-freedombox.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[wordpress-auth-freedombox]
-enabled = true
-filter = wordpress-auth-freedombox
diff --git a/plinth/modules/wordpress/data/etc/fail2ban/jail.d/wordpress-freedombox.conf b/plinth/modules/wordpress/data/etc/fail2ban/jail.d/wordpress-freedombox.conf
new file mode 100644
index 000000000..d68d99506
--- /dev/null
+++ b/plinth/modules/wordpress/data/etc/fail2ban/jail.d/wordpress-freedombox.conf
@@ -0,0 +1,4 @@
+[wordpress-freedombox]
+enabled = true
+filter = wordpress-freedombox
+journalmatch = SYSLOG_IDENTIFIER=apache-access