diff --git a/doc/changelog.txt b/doc/changelog.txt
index d35a279..b461748 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,6 +1,7 @@
 
 HEAD
 ====
+- geoip: for FHS compliance use /usr/share/xt_geoip instead of /var/geoip
 
 
 Xtables-addons 1.21 (December 09 2009)
diff --git a/extensions/libxt_geoip.c b/extensions/libxt_geoip.c
index ba57d07..ba446a5 100644
--- a/extensions/libxt_geoip.c
+++ b/extensions/libxt_geoip.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <xtables.h>
 #include "xt_geoip.h"
-#define GEOIP_DB_DIR "/var/geoip"
+#define GEOIP_DB_DIR "/usr/share/xt_geoip"
 
 static void geoip_help(void)
 {
diff --git a/extensions/libxt_geoip.man b/extensions/libxt_geoip.man
index acb4ab6..bde0ce2 100644
--- a/extensions/libxt_geoip.man
+++ b/extensions/libxt_geoip.man
@@ -7,10 +7,11 @@ Match packet coming from (one of) the specified country(ies)
 Match packet going to (one of) the specified country(ies)
 .TP
 NOTE:
-The country is inputed by its ISO3166 code.
-.P
+The country is inputed by its ISO-3166 code.
+.PP
 The extra files you will need is the binary database files. They are generated
 from a country-subnet database with the geoip_csv_iv0.pl tool, available at
-http://jengelh.hopto.org/files/geoip/ . The files MUST be moved to /var/geoip/
+http://jengelh.hopto.org/files/geoip/ . The files MUST be moved to
+/usr/share/xt_geoip/
 as the shared library is statically looking for this pathname (e.g.
-/var/geoip/LE/de.iv0).
+/usr/share/xt_geoip/LE/de.iv0).