diff --git a/debian/changelog b/debian/changelog
index 0a890b15..0cd947b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ fail2ban (0.8.0-3~pre2) unstable; urgency=low
     #426050). Thanks Roderick Schertler.
   * Added a filter pam_generic to catch any login errors.
   * Added iptables-allports.
+  * Use /var/run to keep socket file (closes: #425746)
 
  -- Yaroslav Halchenko <debian@onerussian.com>  Tue, 19 Jun 2007 23:04:02 -0400
 
diff --git a/debian/jail.conf b/debian/jail.conf
index 00194373..a040870b 100644
--- a/debian/jail.conf
+++ b/debian/jail.conf
@@ -97,6 +97,7 @@ filter	= pam-generic
 # port actually must be irrelevant but lets leave it all for some possible uses
 port = all
 banaction = iptables-allports
+port     = anyport
 logpath  = /var/log/auth.log
 maxretry = 6
 
diff --git a/debian/patches/00_var_run_socket.dpatch b/debian/patches/00_var_run_socket.dpatch
new file mode 100755
index 00000000..20cfe715
--- /dev/null
+++ b/debian/patches/00_var_run_socket.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_var_run_socket.dpatch by Yaroslav Halchenko <debian@onerussian.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: to close 425746: move socket under /var/run
+
+@DPATCH@
+diff -urNad trunk~/config/fail2ban.conf trunk/config/fail2ban.conf
+--- trunk~/config/fail2ban.conf	2007-05-05 21:30:21.000000000 -0400
++++ trunk/config/fail2ban.conf	2007-07-03 18:21:52.000000000 -0400
+@@ -28,7 +28,7 @@
+ # Notes.: Set the socket file. This is used to communicate with the daemon. Do
+ #         not remove this file when Fail2ban runs. It will not be possible to
+ #         communicate with the server afterwards.
+-# Values: FILE  Default:  /tmp/fail2ban.sock
++# Values: FILE  Default:  /var/run/fail2ban.sock
+ #
+-socket = /tmp/fail2ban.sock
++socket = /var/run/fail2ban.sock
+ 
diff --git a/debian/patches/00list b/debian/patches/00list
index 843b8136..34d2afd8 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1,5 @@
 00_mail-whois-lines
+00_var_run_socket
 00_HOST_ignoreregex
 00_daemon_pids
 10_dbts_manpages