diff --git a/ChangeLog b/ChangeLog
index 66df9639..7113d431 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,7 @@ ver. 0.9.1 (2014/xx/xx) - better, faster, stronger
    * Nginx filter to support missing server_name. Closes gh-676
 
 - New features:
+   - Added monit filter thanks Jason H Martin.
 
 
 - Enhancements
diff --git a/THANKS b/THANKS
index 2c084dee..27165492 100644
--- a/THANKS
+++ b/THANKS
@@ -48,6 +48,7 @@ Ivo Truxa
 John Thoe
 Jacques Lav!gnotte
 Ioan Indreias
+Jason H Martin
 Jonathan Kamens
 Jonathan Lanning
 Jonathan Underwood
diff --git a/config/filter.d/monit.conf b/config/filter.d/monit.conf
index f32eae61..04d01b20 100644
--- a/config/filter.d/monit.conf
+++ b/config/filter.d/monit.conf
@@ -2,17 +2,8 @@
 #
 #
 
-[INCLUDES]
-
-# Read common prefixes. If any customizations available -- read them from
-# common.local
-before = common.conf
-
 [Definition]
-# Samples: 
-# [PDT Apr 16 20:59:11] error    : Warning: Client '1.2.3.4' supplied unknown user 'foo' accessing monit httpd
-# [PDT Apr 16 20:59:33] error    : Warning: Client '1.2.3.4' supplied wrong password for user 'admin' accessing monit httpd
 
-failregex = Warning: Client '<HOST>' supplied
+failregex = \]\s*error\s*:\s*Warning:\s+Client '<HOST>' supplied unknown user '\w+' accessing monit httpd$
+            \]\s*error\s*:\s*Warning:\s+Client '<HOST>' supplied wrong password for user '\w+' accessing monit httpd$
 
-ignoreregex =
diff --git a/fail2ban/tests/files/logs/monit b/fail2ban/tests/files/logs/monit
new file mode 100644
index 00000000..a923b6e2
--- /dev/null
+++ b/fail2ban/tests/files/logs/monit
@@ -0,0 +1,6 @@
+# failJSON: { "time": "2005-04-16T21:05:29", "match": true , "host": "69.93.127.111" }
+[PDT Apr 16 21:05:29] error    : Warning: Client '69.93.127.111' supplied unknown user 'foo' accessing monit httpd
+
+# failJSON: { "time": "2005-04-16T20:59:33", "match": true , "host": "97.113.189.111" }
+[PDT Apr 16 20:59:33] error    : Warning: Client '97.113.189.111' supplied wrong password for user 'admin' accessing monit httpd
+