diff --git a/debian/changelog b/debian/changelog
index daa3789..43a0386 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+calamares-settings-ubuntu (7) UNRELEASED; urgency=medium
+
+  * Fix geoip timezone detection.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 11 Jul 2018 22:35:58 -0500
+
 calamares-settings-ubuntu (6) cosmic; urgency=medium
 
   * Fix translations for Calamares.
diff --git a/lubuntu/modules/locale.conf b/lubuntu/modules/locale.conf
index 17261c8..7eb427f 100644
--- a/lubuntu/modules/locale.conf
+++ b/lubuntu/modules/locale.conf
@@ -2,4 +2,6 @@
 region: "America"
 zone: "New_York"
 localeGenPath: "/etc/locale.gen"
-geoipUrl: "freegeoip.net"
+geoipUrl: "https://ipapi.co/json"
+geoipStyle: "json"
+geoipSelector: "timezone"