diff --git a/CHANGELOG b/CHANGELOG
index 58c282bc..4b0b8c82 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,7 +16,7 @@ ver. 0.7.4 (2006/??/??) - beta
   option in "fail2ban.conf"
 - Added "backend" option in "jail.conf"
 - Added more filters/actions and jail samples. Thanks to Nick
-  Munger
+  Munger, Christoph Haas
 - Improved testing framework
 
 ver. 0.7.3 (2006/09/28) - beta
diff --git a/MANIFEST b/MANIFEST
index ccba12b5..b3d825c4 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -60,6 +60,7 @@ config/filter.d/apache-auth.conf
 config/filter.d/apache-noscript.conf
 config/filter.d/qmail.conf
 config/filter.d/couriersmtp.conf
+config/filter.d/courierlogin.conf
 config/filter.d/sshd.conf
 config/filter.d/proftpd.conf
 config/filter.d/sasl.conf
diff --git a/README b/README
index 4e4a3c8f..e0a718e8 100644
--- a/README
+++ b/README
@@ -96,7 +96,8 @@ Thanks:
 Kévin Drapel, Marvin Rouge, Sireyessire, Robert Edeker,
 Tom Pike, Iain Lea, Andrey G. Grozin, Yaroslav Halchenko,
 Jonathan Kamens, Stephen Gildea, Markus Hoffmann, Mark
-Edgington, Patrick Börjesson, kojiro, zugeschmiert, Tyler
+Edgington, Patrick Börjesson, kojiro, zugeschmiert, Tyler,
+Nick Munger, Christoph Haas
 
 License:
 --------
diff --git a/config/filter.d/courierlogin.conf b/config/filter.d/courierlogin.conf
new file mode 100644
index 00000000..5b8dac6f
--- /dev/null
+++ b/config/filter.d/courierlogin.conf
@@ -0,0 +1,15 @@
+# Fail2Ban configuration file
+#
+# Author: Christoph Haas
+# Modified by: Cyril Jaquier
+#
+# $Revision: 267 $
+#
+
+[Definition]
+
+# Option:  failregex
+# Notes.:  regex to match the password failures messages in the logfile.
+# Values:  TEXT
+#
+failregex = LOGIN FAILED, ip=\[::ffff:(?P<host>\S*)\]$