diff --git a/config/jail.conf b/config/jail.conf
index c6eea0ef..1e663a22 100644
--- a/config/jail.conf
+++ b/config/jail.conf
@@ -457,23 +457,15 @@ ignoreip = 168.192.0.1
 # Miscelaneous
 #
 
-# Multiple jails, 1 per protocol, are necessary ATM:
-# see https://github.com/fail2ban/fail2ban/issues/37
-[asterisk-tcp]
+[asterisk]
 
-filter   = asterisk
 port     = 5060,5061
-protocol = tcp
-logpath  = /var/log/asterisk/messages
-maxretry = 10
-
-[asterisk-udp]
-
-filter	 = asterisk
-port     = 5060,5061
-protocol = udp
 logpath  = /var/log/asterisk/messages
 maxretry = 10
+# Astrix requires both tcp and udp
+action   = %(banaction)s[name=%(__name__)s-tcp, port="%(port)s", protocol="tcp", chain="%(chain)s", actname=%(banaction)s-tcp]
+           %(banaction)s[name=%(__name__)s-udp, port="%(port)s", protocol="udp", chain="%(chain)s", actname=%(banaction)s-udp]
+           %(mta)s-whois[name=%(__name__)s, dest="%(destemail)s"]
 
 # To log wrong MySQL access attempts add to /etc/my.cnf:
 # log-error=/var/log/mysqld.log