diff --git a/debian/changelog b/debian/changelog
index 4dfc7b22..e9a7bafb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+fail2ban (0.6.1-3) unstable; urgency=low
+
+  * Fixed vsftpd failregexp (closes: #366687)
+  * Started to use dpatch
+
+ -- Yaroslav Halchenko <debian@onerussian.com>  Wed, 10 May 2006 11:45:57 -0400
+
 fail2ban (0.6.1-2) unstable; urgency=low
 
   * Assigned maxreinits to 1000 to be reasonable since otherwise logfile grows
diff --git a/debian/control b/debian/control
index 5e46d298..e84138ac 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Yaroslav Halchenko <debian@onerussian.com>
 Uploaders: Barak Pearlmutter <bap@debian.org>
-Build-Depends-Indep: debhelper (>= 4.1.67), python, python-dev, help2man
+Build-Depends-Indep: debhelper (>= 4.1.67), python, python-dev, help2man, dpatch
 Standards-Version: 3.6.2
 
 Package: fail2ban
diff --git a/debian/patches/00_vsftpd_regexp.dpatch b/debian/patches/00_vsftpd_regexp.dpatch
new file mode 100755
index 00000000..6217a58e
--- /dev/null
+++ b/debian/patches/00_vsftpd_regexp.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_vsftpd_regexp.dpatch by  <debian@onerussian.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix of debian bug #366687: strict regexp for vsftpd
+
+@DPATCH@
+
+diff -rNu fail2ban-0.6.1.orig/config/fail2ban.conf.iptables fail2ban-0.6.1.fixed/config/fail2ban.conf.iptables
+--- fail2ban-0.6.1.orig/config/fail2ban.conf.iptables	2006-03-27 12:56:38.000000000 -0500
++++ fail2ban-0.6.1.fixed/config/fail2ban.conf.iptables	2006-05-10 13:47:40.000000000 -0400
+@@ -383,7 +383,7 @@
+ # Notes.: regex to match the password failures messages in the logfile.
+ # Values: TEXT Default: Authentication failure|Failed password|Invalid user
+ #
+-failregex = FAIL LOGIN
++failregex = \[.+\] FAIL LOGIN: Client "(?P<host>\S+)"$
+ 
+ [SSH]
+ # Option:  enabled
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 00000000..e8e1b369
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1 @@
+00_vsftpd_regexp
diff --git a/debian/rules b/debian/rules
index 505f5dbe..8379baec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,13 +12,18 @@
 MANPAGE=fail2ban.8
 DESTDIR=$(CURDIR)/debian/fail2ban
 
+# no parallel execution -- required for dpatch
+.NOTPARALLEL:
+
+include /usr/share/dpatch/dpatch.make
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 	# Add here commands to configure the package.
 	touch configure-stamp
 
-build: build-stamp
+build: patch build-stamp
 
 build-stamp: configure-stamp
 	dh_testdir
@@ -32,7 +37,7 @@ copy-inits:
 clean-inits:
 	rm -f debian/fail2ban.{default,init,logrotate}
 
-clean:	clean-inits
+clean: clean-inits unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp