diff --git a/debian/patches/00_share_insteadof_lib.dpatch b/debian/patches/00_share_insteadof_lib.dpatch
index b35635a8..f0d665a9 100755
--- a/debian/patches/00_share_insteadof_lib.dpatch
+++ b/debian/patches/00_share_insteadof_lib.dpatch
@@ -5,9 +5,9 @@
 ## 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
+diff -urNad fail2ban-0.7.5~/fail2ban-client fail2ban-0.7.5/fail2ban-client
+--- fail2ban-0.7.5~/fail2ban-client	2006-12-07 20:59:15.000000000 -0500
++++ fail2ban-0.7.5/fail2ban-client	2006-12-07 20:59:15.000000000 -0500
 @@ -30,7 +30,7 @@
  
  # Inserts our own modules path first in the list
@@ -16,10 +16,10 @@ diff -urNad fail2ban-0.7.4~pre2006102~/fail2ban-client fail2ban-0.7.4~pre2006102
 +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
+ from common.version import version
+diff -urNad fail2ban-0.7.5~/fail2ban-regex fail2ban-0.7.5/fail2ban-regex
+--- fail2ban-0.7.5~/fail2ban-regex	2006-11-16 15:59:47.000000000 -0500
++++ fail2ban-0.7.5/fail2ban-regex	2006-12-07 20:59:15.000000000 -0500
 @@ -29,7 +29,7 @@
  
  # Inserts our own modules path first in the list
@@ -27,11 +27,11 @@ diff -urNad fail2ban-0.7.4~pre2006102~/fail2ban-regex fail2ban-0.7.4~pre2006102/
 -sys.path.insert(1, "/usr/lib/fail2ban")
 +sys.path.insert(1, "/usr/share/fail2ban")
  
- from version import version
+ from common.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
+diff -urNad fail2ban-0.7.5~/fail2ban-server fail2ban-0.7.5/fail2ban-server
+--- fail2ban-0.7.5~/fail2ban-server	2006-12-07 20:59:15.000000000 -0500
++++ fail2ban-0.7.5/fail2ban-server	2006-12-07 20:59:15.000000000 -0500
 @@ -29,7 +29,7 @@
  
  # Inserts our own modules path first in the list
@@ -39,11 +39,11 @@ diff -urNad fail2ban-0.7.4~pre2006102~/fail2ban-server fail2ban-0.7.4~pre2006102
 -sys.path.insert(1, "/usr/lib/fail2ban")
 +sys.path.insert(1, "/usr/share/fail2ban")
  
- from version import version
+ from common.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
+diff -urNad fail2ban-0.7.5~/fail2ban-testcases fail2ban-0.7.5/fail2ban-testcases
+--- fail2ban-0.7.5~/fail2ban-testcases	2006-12-07 20:59:15.000000000 -0500
++++ fail2ban-0.7.5/fail2ban-testcases	2006-12-07 20:59:15.000000000 -0500
 @@ -30,7 +30,7 @@
  
  # Inserts our own modules path first in the list
@@ -51,11 +51,11 @@ diff -urNad fail2ban-0.7.4~pre2006102~/fail2ban-testcases fail2ban-0.7.4~pre2006
 -sys.path.insert(1, "/usr/lib/fail2ban")
 +sys.path.insert(1, "/usr/share/fail2ban")
  
- from version import version
+ from common.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
+diff -urNad fail2ban-0.7.5~/setup.cfg fail2ban-0.7.5/setup.cfg
+--- fail2ban-0.7.5~/setup.cfg	2006-11-01 16:08:43.000000000 -0500
++++ fail2ban-0.7.5/setup.cfg	2006-12-07 20:59:15.000000000 -0500
 @@ -1,5 +1,5 @@
  [install]
 -install-purelib=/usr/lib/fail2ban
@@ -63,15 +63,22 @@ diff -urNad fail2ban-0.7.4~pre2006102~/setup.cfg fail2ban-0.7.4~pre2006102/setup
  
  [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 @@
+diff -urNad fail2ban-0.7.5~/setup.py fail2ban-0.7.5/setup.py
+--- fail2ban-0.7.5~/setup.py	2006-12-07 20:59:15.000000000 -0500
++++ fail2ban-0.7.5/setup.py	2006-12-07 21:10:02.000000000 -0500
+@@ -84,13 +84,13 @@
  					[
  						"fail2ban.py"
- 					],
+ 					], 
 -				"/usr/lib/fail2ban/firewall/":
 +				"/usr/share/fail2ban/firewall/":
  					[
- 						"iptables.py",
- 						"ipfwadm.py",
+ 						"iptables.py", 
+ 						"ipfwadm.py", 
+ 						"ipfw.py"
+ 					],
+-				"/usr/lib/fail2ban/":
++				"/usr/share/fail2ban/":
+ 					[
+ 						"version.py", 
+ 						"protocol.py"