diff --git a/LICENSE b/LICENSE
index 57b838d9e..197c92a97 100644
--- a/LICENSE
+++ b/LICENSE
@@ -77,4 +77,9 @@ If you got Tor as a static binary with OpenSSL included, then you should know:
  "This product includes software developed by the OpenSSL Project
  for use in the OpenSSL Toolkit (http://www.openssl.org/)"
 ===============================================================================
+"This program uses the IP-to-Country Database provided by
+WebHosting.Info (http://www.webhosting.info), available from
+http://ip-to-country.webhosting.info."
+See the src/config/geoip file in particular.
+===============================================================================
 
diff --git a/src/config/Makefile.am b/src/config/Makefile.am
index 07e7cf26a..21fba9177 100644
--- a/src/config/Makefile.am
+++ b/src/config/Makefile.am
@@ -1,11 +1,12 @@
 confdir = $(sysconfdir)/tor
 
-#EXTRA_DIST = fallback-consensus
+EXTRA_DIST = fallback-consensus geoip
 
 conf_DATA = torrc.sample
 
-#data_DATA = fallback-consensus
+data_DATA = fallback-consensus geoip
 
 # If we don't have it, fake it.
 fallback-consensus:
 	touch fallback-consensus
+
diff --git a/src/or/config.c b/src/or/config.c
index 1d40fda1d..74c500d34 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -198,7 +198,8 @@ static config_var_t _option_vars[] = {
   V(FetchServerDescriptors,      BOOL,     "1"),
   V(FetchHidServDescriptors,     BOOL,     "1"),
   V(FetchUselessDescriptors,     BOOL,     "0"),
-  V(GeoIPFile,                   STRING,   NULL),
+  V(GeoIPFile,                   STRING,
+    SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"),
   V(Group,                       STRING,   NULL),
   V(HardwareAccel,               BOOL,     "0"),
   V(HashedControlPassword,       LINELIST, NULL),