diff --git a/CHANGELOG b/CHANGELOG
index c822d3d8..71983906 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,10 +4,10 @@
              |_| \__,_|_|_/___|_.__/\__,_|_||_|
 
 =============================================================
-Fail2Ban (version 0.7.6)                           200?/??/??
+Fail2Ban (version 0.7.6)                           2007/01/04
 =============================================================
 
-ver. 0.7.6 (200?/??/??) - ???
+ver. 0.7.6 (2007/01/04) - beta
 ----------
 - Added a "sleep 1" in redhat-initd. Thanks to Jim Wight
 - Use /dev/log for SYSLOG output. Thanks to Joerg Sommrey
@@ -20,6 +20,9 @@ ver. 0.7.6 (200?/??/??) - ???
 - Added license in COPYING. Thanks to Axel Thimm
 - Allow comma in action options. The value of the option must
   be escaped with " or '. Thanks to Yaroslav Halchenko
+- Now Fail2ban goes in /usr/share/fail2ban instead of
+  /usr/lib/fail2ban. This is more compliant with FHS. Thanks
+  to Axel Thimm and Yaroslav Halchenko
 
 ver. 0.7.5 (2006/12/07) - beta
 ----------
diff --git a/fail2ban-client b/fail2ban-client
index dbb84616..14aeabd0 100755
--- a/fail2ban-client
+++ b/fail2ban-client
@@ -30,7 +30,7 @@ import getopt, time, readline, shlex, socket
 
 # 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 common.version import version
diff --git a/fail2ban-regex b/fail2ban-regex
index a5f28780..8074a853 100755
--- a/fail2ban-regex
+++ b/fail2ban-regex
@@ -29,7 +29,7 @@ import locale, getopt, sys, time, logging, gc
 
 # 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 common.version import version
 from server.filter import Filter
diff --git a/fail2ban-server b/fail2ban-server
index 7602bd85..bdb7455f 100755
--- a/fail2ban-server
+++ b/fail2ban-server
@@ -29,7 +29,7 @@ import getopt, sys
 
 # 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 common.version import version
 from server.server import Server
diff --git a/fail2ban-testcases b/fail2ban-testcases
index 91c34317..38ab89d7 100755
--- a/fail2ban-testcases
+++ b/fail2ban-testcases
@@ -30,7 +30,7 @@ import unittest, logging, sys
 
 # 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 common.version import version
 from testcases import banmanagertestcase
diff --git a/setup.cfg b/setup.cfg
index fba97f88..cdc25b29 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [install]
-install-purelib=/usr/lib/fail2ban
+install-purelib=/usr/share/fail2ban
 
 [sdist]
 formats=bztar
diff --git a/setup.py b/setup.py
index 9ad1ece5..12da08f3 100755
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ __license__ = "GPL"
 
 from distutils.core import setup
 from common.version import version
-from os.path import isfile, join
+from os.path import isfile, join, isdir
 from sys import argv
 from glob import glob
 
@@ -113,6 +113,13 @@ if obsoleteFiles:
 		print "\t" + f
 	print
 
+if isdir("/usr/lib/fail2ban"):
+	print
+	print "Fail2ban is not installed under /usr/lib anymore. The new " \
+		  "location is under /usr/share. Please remove the directory " \
+		  "/usr/lib/fail2ban and everything under this directory."
+	print
+
 # Update config file
 if argv[1] == "install":
 	print