diff --git a/files/fail2ban.upstart b/files/fail2ban.upstart
index 1780a810..19349ebd 100644
--- a/files/fail2ban.upstart
+++ b/files/fail2ban.upstart
@@ -3,11 +3,9 @@ description "fail2ban - ban hosts that cause multiple authentication errors"
 start on filesystem and started networking
 stop on deconfiguring-networking
 
-expect fork
+expect daemon
 respawn
 
-exec /usr/bin/fail2ban-client -x -b start
-
-pre-stop exec /usr/bin/fail2ban-client stop
+exec /usr/bin/fail2ban-server -x -b
 
 post-stop exec rm -f /var/run/fail2ban/fail2ban.pid