diff --git a/ChangeLog b/ChangeLog
index ad92a55e..3e9d99b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -81,6 +81,7 @@ ver. 0.9.1 (2014/xx/xx) - better, faster, stronger
      not affect SYSLOG output
    * Log unhandled exceptions
    * cyrus-imap: catch "user not found" attempts
+   * Add support for Portsentry
 
 ver. 0.9.0 (2014/03/14) - beta
 ----------
diff --git a/config/filter.d/portsentry.conf b/config/filter.d/portsentry.conf
new file mode 100644
index 00000000..1ee9531c
--- /dev/null
+++ b/config/filter.d/portsentry.conf
@@ -0,0 +1,10 @@
+# Fail2Ban filter for failure attempts in Counter Strike-1.6
+#
+#
+
+[Definition]
+
+failregex = \/<HOST> Port\: [0-9]+ (TCP|UDP) Blocked$
+
+# Author: Pacop <pacoparu@gmail.com>
+
diff --git a/config/jail.conf b/config/jail.conf
index 99729350..d31e70d7 100644
--- a/config/jail.conf
+++ b/config/jail.conf
@@ -719,3 +719,8 @@ banaction = iptables-allports
 enabled = false
 logpath = /var/log/directadmin/login.log
 port = 2222
+
+[portsentry]
+enabled  = false
+logpath  = /var/lib/portsentry/portsentry.history
+maxretry = 1
\ No newline at end of file
diff --git a/fail2ban/tests/datedetectortestcase.py b/fail2ban/tests/datedetectortestcase.py
index 726e73f8..c82f92ba 100644
--- a/fail2ban/tests/datedetectortestcase.py
+++ b/fail2ban/tests/datedetectortestcase.py
@@ -86,6 +86,7 @@ class DateDetectorTest(unittest.TestCase):
 			(False, "23-Jan-2005 21:59:59.02"),
 			(False, "23-Jan-2005 21:59:59 +0100"),
 			(False, "23-01-2005 21:59:59"),
+			(True, "1106513999"), # Portsetry
 			(False, "01-23-2005 21:59:59.252"), # reported on f2b, causes Feb29 fix to break
 			(False, "@4000000041f4104f00000000"), # TAI64N
 			(False, "2005-01-23T20:59:59.252Z"), #ISO 8601 (UTC)
diff --git a/fail2ban/tests/files/logs/portsentry b/fail2ban/tests/files/logs/portsentry
new file mode 100644
index 00000000..19c917a0
--- /dev/null
+++ b/fail2ban/tests/files/logs/portsentry
@@ -0,0 +1,4 @@
+# failJSON: { "time": "2014-06-27T17:51:19", "match": true , "host": "192.168.56.1" }
+1403884279 - 06/27/2014 17:51:19 Host: 192.168.56.1/192.168.56.1 Port: 1 TCP Blocked
+# failJSON: { "time": "2014-06-27T17:51:19", "match": true , "host": "192.168.56.1" }
+1403884279 - 06/27/2014 17:51:19 Host: 192.168.56.1/192.168.56.1 Port: 1 UDP Blocked
\ No newline at end of file