diff --git a/debian/changelog b/debian/changelog
index c072cf92..e63ccd95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ fail2ban (0.7.4~pre2006102-1) experimental; urgency=low
     from debian/patches
   * Adjusted rule to install man pages -- only .1 files since there are also
     h2m sources
+  * debian/{rules,control} adjusted to conform all points in recent python
+    policy changes
+  * install under /usr/share instead of /usr/lib
 
  -- Yaroslav Halchenko <debian@onerussian.com>  Mon, 23 Oct 2006 00:17:55 -0400
 
diff --git a/debian/control b/debian/control
index 2440a3ac..27319430 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Yaroslav Halchenko <debian@onerussian.com>
 Uploaders: Barak Pearlmutter <bap@debian.org>
 Build-Depends: debhelper (>= 5.0.37.2), dpatch
-Build-Depends-Indep: python, python-dev, help2man, python-central (>= 0.5)
+Build-Depends-Indep: python, python-dev, help2man, python-central (>= 0.5.6)
 XS-Python-Version: current, >= 2.4
 Standards-Version: 3.7.2
 
@@ -12,7 +12,7 @@ Package: fail2ban
 Architecture: all
 Depends: ${python:Depends}, iptables, lsb-base (>=2.0-7)
 Suggests: python-gamin
-XB-Python-Version: 2.4
+XB-Python-Version: ${python:Versions}
 Description: bans IPs that cause multiple authentication errors
  Monitors log files (e.g. /var/log/auth.log,
  /var/log/apache/access.log) and temporarily or persistently bans
diff --git a/debian/patches/00_share_insteadof_lib.dpatch b/debian/patches/00_share_insteadof_lib.dpatch
new file mode 100755
index 00000000..b35635a8
--- /dev/null
+++ b/debian/patches/00_share_insteadof_lib.dpatch
@@ -0,0 +1,77 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_share_insteadof_lib.dpatch by Yaroslav Halchenko <debian@onerussian.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad fail2ban-0.7.4~pre2006102~/fail2ban-client fail2ban-0.7.4~pre2006102/fail2ban-client
+--- fail2ban-0.7.4~pre2006102~/fail2ban-client	2006-10-17 17:13:54.000000000 -0400
++++ fail2ban-0.7.4~pre2006102/fail2ban-client	2006-10-23 01:05:20.000000000 -0400
+@@ -30,7 +30,7 @@
+ 
+ # Inserts our own modules path first in the list
+ # fix for bug #343821
+-sys.path.insert(1, "/usr/lib/fail2ban")
++sys.path.insert(1, "/usr/share/fail2ban")
+ 
+ # Now we can import our modules
+ from version import version
+diff -urNad fail2ban-0.7.4~pre2006102~/fail2ban-regex fail2ban-0.7.4~pre2006102/fail2ban-regex
+--- fail2ban-0.7.4~pre2006102~/fail2ban-regex	2006-10-01 17:22:27.000000000 -0400
++++ fail2ban-0.7.4~pre2006102/fail2ban-regex	2006-10-23 01:05:20.000000000 -0400
+@@ -29,7 +29,7 @@
+ 
+ # Inserts our own modules path first in the list
+ # fix for bug #343821
+-sys.path.insert(1, "/usr/lib/fail2ban")
++sys.path.insert(1, "/usr/share/fail2ban")
+ 
+ from version import version
+ from server.filter import Filter
+diff -urNad fail2ban-0.7.4~pre2006102~/fail2ban-server fail2ban-0.7.4~pre2006102/fail2ban-server
+--- fail2ban-0.7.4~pre2006102~/fail2ban-server	2006-10-04 18:17:53.000000000 -0400
++++ fail2ban-0.7.4~pre2006102/fail2ban-server	2006-10-23 01:05:20.000000000 -0400
+@@ -29,7 +29,7 @@
+ 
+ # Inserts our own modules path first in the list
+ # fix for bug #343821
+-sys.path.insert(1, "/usr/lib/fail2ban")
++sys.path.insert(1, "/usr/share/fail2ban")
+ 
+ from version import version
+ from server.server import Server
+diff -urNad fail2ban-0.7.4~pre2006102~/fail2ban-testcases fail2ban-0.7.4~pre2006102/fail2ban-testcases
+--- fail2ban-0.7.4~pre2006102~/fail2ban-testcases	2006-10-18 18:35:32.000000000 -0400
++++ fail2ban-0.7.4~pre2006102/fail2ban-testcases	2006-10-23 01:05:20.000000000 -0400
+@@ -30,7 +30,7 @@
+ 
+ # Inserts our own modules path first in the list
+ # fix for bug #343821
+-sys.path.insert(1, "/usr/lib/fail2ban")
++sys.path.insert(1, "/usr/share/fail2ban")
+ 
+ from version import version
+ from testcases import banmanagertestcase
+diff -urNad fail2ban-0.7.4~pre2006102~/setup.cfg fail2ban-0.7.4~pre2006102/setup.cfg
+--- fail2ban-0.7.4~pre2006102~/setup.cfg	2006-07-16 18:21:58.000000000 -0400
++++ fail2ban-0.7.4~pre2006102/setup.cfg	2006-10-23 01:05:20.000000000 -0400
+@@ -1,5 +1,5 @@
+ [install]
+-install-purelib=/usr/lib/fail2ban
++install-purelib=/usr/share/fail2ban
+ 
+ [sdist]
+ formats=bztar
+diff -urNad fail2ban-0.7.4~pre2006102~/setup.py fail2ban-0.7.4~pre2006102/setup.py
+--- fail2ban-0.7.4~pre2006102~/setup.py	2006-10-17 17:13:11.000000000 -0400
++++ fail2ban-0.7.4~pre2006102/setup.py	2006-10-23 01:05:20.000000000 -0400
+@@ -84,7 +84,7 @@
+ 					[
+ 						"fail2ban.py"
+ 					],
+-				"/usr/lib/fail2ban/firewall/":
++				"/usr/share/fail2ban/firewall/":
+ 					[
+ 						"iptables.py",
+ 						"ipfwadm.py",
diff --git a/debian/patches/00list b/debian/patches/00list
index 0ff7a1d5..1f5d3f54 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
 X00_rigid_python24
+00_share_insteadof_lib
 10_dbts_manpages
 10_wuftpd_section
diff --git a/debian/rules b/debian/rules
index 04246140..6e6709b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,7 +79,6 @@ binary-indep: install
 #	dh_installinfo
 	dh_installman man/*.1
 	dh_pycentral
-	dh_python
 	dh_link
 	dh_compress
 	dh_fixperms