diff --git a/ChangeLog b/ChangeLog
index 2369bc21..62802a33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@ ver. 0.8.12 (2013/12/XX) - things-can-only-get-better
 
 - New Features:
 
+  Daniel Black
+   * filter.d/solid-pop3d -- added thanks to Jacques Lav!gnotte on mailinglist.
+
 - Enhancements:
 
 
diff --git a/THANKS b/THANKS
index 13303c21..ee3922dd 100644
--- a/THANKS
+++ b/THANKS
@@ -33,6 +33,7 @@ Georgiy Mernov
 Guillaume Delvit
 Hanno 'Rince' Wagner
 Iain Lea
+Jacques Lav!gnotte
 Jonathan Kamens
 Jonathan Lanning
 Jonathan Underwood
diff --git a/config/filter.d/solid-pop3d.conf b/config/filter.d/solid-pop3d.conf
new file mode 100644
index 00000000..d97cc134
--- /dev/null
+++ b/config/filter.d/solid-pop3d.conf
@@ -0,0 +1,32 @@
+# Fail2Ban filter for unsuccesful solid-pop3 authentication attempts
+#
+# Doesn't currently provide PAM support as PAM log messages don't include rhost as
+# remote IP.
+#
+[INCLUDES]
+
+before = common.conf
+
+[Definition]
+
+_daemon = solid-pop3d
+
+failregex = ^%(__prefix_line)sauthentication failed: (no such user|can't map user name): .*? - <HOST>$
+            ^%(__prefix_line)s(APOP )?authentication failed for (mapped )?user .*? - <HOST>$
+            ^%(__prefix_line)sroot login not allowed - <HOST>$
+            ^%(__prefix_line)scan't find APOP secret for user .*? - <HOST>$
+
+ignoreregex = 
+
+# DEV Notes:
+#
+# solid-pop3d needs to be compiled with --enable-logextend to support
+# IP addresses in log messages.
+#
+# solid-pop3d-0.15/src/main.c contains all authentication errors
+# except for PAM authentication messages ( src/authenticate.c )
+#
+# A pam authentication failure message (note no IP for rhost).
+# Nov 17 23:17:50 emf1pt2-2-35-70 solid-pop3d[17176]: pam_unix(solid-pop3d:auth): authentication failure; logname= uid=0 euid=0 tty= ruser= rhost=  user=jacques
+# 
+# Authors: Daniel Black
diff --git a/config/jail.conf b/config/jail.conf
index 486ea078..0de7f524 100644
--- a/config/jail.conf
+++ b/config/jail.conf
@@ -518,6 +518,14 @@ action  = iptables-multiport[name=dovecot-auth, port="pop3,pop3s,imap,imaps,subm
 logpath = /var/log/secure
 
 
+[solid-pop3d]
+
+enabled = false
+filter  = solid-pop3d
+action  = iptables-multiport[name=solid-pop3, port="pop3,pop3s", protocol=tcp]
+logpath = /var/log/mail.log
+
+
 [selinux-ssh]
 enabled = false
 filter  = selinux-ssh
diff --git a/testcases/files/logs/solid-pop3d b/testcases/files/logs/solid-pop3d
new file mode 100644
index 00000000..45c4ecaf
--- /dev/null
+++ b/testcases/files/logs/solid-pop3d
@@ -0,0 +1,25 @@
+# failJSON: { "time": "2004-11-15T00:34:53", "match": true , "host": "123.33.44.45" }
+Nov 15 00:34:53 rmc1pt2-2-35-70 solid-pop3d[3822]: authentication failed: no such user: adrian - 123.33.44.45
+
+# All below are manufactured from looking at log
+# failJSON: { "time": "2004-11-15T00:34:53", "match": true , "host": "123.33.44.45" }
+Nov 15 00:34:53 rmc1pt2-2-35-70 solid-pop3d[3822]: authentication failed: can't map user name: adrian - 123.33.44.45
+
+# failJSON: { "time": "2004-11-15T00:34:53", "match": true , "host": "123.33.44.45" }
+Nov 15 00:34:53 rmc1pt2-2-35-70 solid-pop3d[3822]: authentication failed for user adrain - 123.33.44.45
+
+# failJSON: { "time": "2004-11-15T00:34:53", "match": true , "host": "123.33.44.45" }
+Nov 15 00:34:53 rmc1pt2-2-35-70 solid-pop3d[3822]: authentication failed for mapped user adrain - 123.33.44.45
+
+# failJSON: { "time": "2004-11-15T00:34:53", "match": true , "host": "123.33.44.45" }
+Nov 15 00:34:53 rmc1pt2-2-35-70 solid-pop3d[3822]: root login not allowed - 123.33.44.45
+
+# failJSON: { "time": "2004-11-15T00:34:53", "match": true , "host": "123.33.44.45" }
+Nov 15 00:34:53 rmc1pt2-2-35-70 solid-pop3d[3822]: can't find APOP secret for user adrian - 123.33.44.45
+
+# failJSON: { "time": "2004-11-15T00:34:53", "match": true , "host": "123.33.44.45" }
+Nov 15 00:34:53 rmc1pt2-2-35-70 solid-pop3d[3822]: APOP authentication failed for user adrian - 123.33.44.45
+
+# Real log messages again:
+# failJSON: { "time": "2004-11-17T23:10:03", "match": true , "host": "190.16.165.230" }
+Nov 17 23:10:03 emf1pt2-2-35-70 solid-pop3d[16993]: authentication failed for user jacques - 190.16.165.230