diff --git a/conf/fail2ban/jail.local b/conf/fail2ban/jail.local
index 8a4f32f2..76f8b22e 100644
--- a/conf/fail2ban/jail.local
+++ b/conf/fail2ban/jail.local
@@ -48,6 +48,22 @@ logpath  = /home/user-data/owncloud/owncloud.log
 maxretry = 20
 findtime = 30
 
+[munin]
+enabled  = true
+port     = http,https
+filter   = munin
+logpath  = /var/log/nginx/access.log
+maxretry = 20
+findtime = 30
+
+[postfix-submission]
+enabled  = true
+port     = 587
+filter   = postfix-submission
+logpath  = /var/log/mail.log
+maxretry = 20
+findtime = 30
+
 [recidive]
 enabled  = true
 maxretry = 10
diff --git a/conf/fail2ban/munin.conf b/conf/fail2ban/munin.conf
new file mode 100644
index 00000000..b254cc62
--- /dev/null
+++ b/conf/fail2ban/munin.conf
@@ -0,0 +1,7 @@
+[INCLUDES]
+
+before = common.conf
+
+[Definition]
+failregex=<HOST> - .*GET /admin/munin/.* HTTP/1.1\" 401.*
+ignoreregex =
diff --git a/conf/fail2ban/postfix-submission.conf b/conf/fail2ban/postfix-submission.conf
new file mode 100644
index 00000000..236e1331
--- /dev/null
+++ b/conf/fail2ban/postfix-submission.conf
@@ -0,0 +1,7 @@
+[INCLUDES]
+
+before = common.conf
+
+[Definition]
+failregex=postfix/submission/smtpd.*warning.*\[<HOST>\]: .* authentication (failed|aborted)
+ignoreregex =
diff --git a/setup/system.sh b/setup/system.sh
index be20a1b1..202f0959 100755
--- a/setup/system.sh
+++ b/setup/system.sh
@@ -289,4 +289,6 @@ cp conf/fail2ban/dovecotimap.conf /etc/fail2ban/filter.d/dovecotimap.conf
 cp conf/fail2ban/miab-management-daemon.conf /etc/fail2ban/filter.d/miab-management-daemon.conf
 cp conf/fail2ban/roundcube.conf /etc/fail2ban/filter.d/roundcube.conf
 cp conf/fail2ban/owncloud.conf /etc/fail2ban/filter.d/owncloud.conf
+cp conf/fail2ban/munin.conf /etc/fail2ban/filter.d/munin.conf
+cp conf/fail2ban/postfix-submission.conf /etc/fail2ban/filter.d/postfix-submission.conf
 restart_service fail2ban