diff --git a/ChangeLog b/ChangeLog
index c2b72af5c..5d124c8a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Deluge 0.9.10 - "1.0.0_RC10" (In Development)
+ Core:
+  * Include GeoIP database for country look-ups
+
 Deluge 0.9.09 - "1.0.0_RC9" (15 September 2008)
  Core:
   * Bug fixes in libtorrent including a crash when the tracker doesn't
diff --git a/deluge/core/core.py b/deluge/core/core.py
index a6b6a06b2..e815ed1ae 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -212,6 +212,10 @@ class Core(
         # Set the user agent
         self.settings = lt.session_settings()
         self.settings.user_agent = "Deluge %s" % deluge.common.get_version()
+
+        # Load the GeoIP DB for country look-ups
+        self.session.load_country_db(
+            pkg_resources.resource_filename("deluge", os.path.join("data", "GeoIP.dat")))
         
         # Set session settings
         self.settings.lazy_bitfields = 1
diff --git a/deluge/data/GeoIP.dat b/deluge/data/GeoIP.dat
new file mode 100644
index 000000000..77759385a
Binary files /dev/null and b/deluge/data/GeoIP.dat differ
diff --git a/setup.py b/setup.py
index afb1e03aa..43e533d64 100644
--- a/setup.py
+++ b/setup.py
@@ -311,6 +311,7 @@ setup(
                                 "data/pixmaps/*.ico",
                                 "data/pixmaps/flags/*.png",
                                 "data/revision",
+                                "data/GeoIP.dat",
                                 "plugins/*.egg",
                                 "i18n/*.pot",
                                 "i18n/*/LC_MESSAGES/*.mo",