diff --git a/files/config b/files/config
--- a/files/config
+++ b/files/config
@@ -1,38 +1,35 @@
 mk_add_options MOZ_MAKE_FLAGS="##JOBCOUNT##"
-
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-startup-notification
-
-# System libs
-ac_add_options --with-system-sqlite
-ac_add_options --with-system-libevent
+mk_add_options MZ_OBJDIR=@TOPSRCDIR@/firefox/build-dir
 
 ac_add_options --prefix=/usr
-ac_add_options --enable-application=browser
+
+export MOZILLA_OFFICIAL=1
+ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=release
+ac_add_options --enable-startup-notification
+ac_add_options --enable-application=browser
 ac_add_options --enable-release
-ac_add_options --disable-stylo
-# Workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1341234
-ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)"
-
+ac_add_options --enable-pie
 ac_add_options --enable-crashreporter
+ac_add_options --enable-default-toolkit=cairo-gtk3
+
 ac_add_options --disable-updater
 ac_add_options --disable-strip
-ac_add_options --enable-pie
-
-export MOZILLA_OFFICIAL=1
-ac_add_options --enable-official-branding
-
-ac_add_options --enable-system-ffi
+ac_add_options --disable-stylo
+# Workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1341234
+ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)"
 
+# System libs
 ac_add_options --with-system-bz2
 ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
+ac_add_options --with-system-libevent
 ac_add_options --with-system-libvpx
+ac_add_options --with-system-sqlite
+ac_add_options --with-system-zlib
+
 ac_add_options --enable-system-ffi
 ac_add_options --enable-system-pixman
+ac_add_options --enable-system-hunspell
 
-ac_add_options --enable-default-toolkit=cairo-gtk3
-
-mk_add_options MZ_OBJDIR=@TOPSRCDIR@/firefox/build-dir
-
+# Keys
+ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
diff --git a/files/mozilla-api-key b/files/mozilla-api-key
new file mode 100644
--- /dev/null
+++ b/files/mozilla-api-key
@@ -0,0 +1 @@
+1e3c881a95fe4054960ee8bc18f7d4fd
diff --git a/files/prefs.js b/files/prefs.js
--- a/files/prefs.js
+++ b/files/prefs.js
@@ -21,3 +21,4 @@
 pref("layers.acceleration.force-enabled",   false);
 pref("extensions.webextensions.base-content-security-policy", "script-src 'self' https://* moz-extension: blob: filesystem: 'unsafe-eval' 'unsafe-inline'; object-src 'self' https://* moz-extension: blob: filesystem:;");
 pref("browser.tabs.remote.autostart",       true);
+pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,9 +1,9 @@
 name       : firefox
-version    : 57.0.3
-release    : 113
+version    : 57.0.4
+release    : 114
 source     :
-    - https://ftp.mozilla.org/pub/firefox/releases/57.0.3/source/firefox-57.0.3.source.tar.xz : c5d4a32bfb099f0b31941b59f78d2dc2f42ed272117512fa39de92688d48f424
-    - https://solus-project.com/sources/mozilla/firefox-57.0.3-langpacks.tar.xz : afae4b560adc224acb716a015ad8a3a8ea899b80307a45e77359ab84d001c01f
+    - https://ftp.mozilla.org/pub/firefox/releases/57.0.4/source/firefox-57.0.4.source.tar.xz : 97cced69abfd5c57d968f0095631f86beff4f7b61883edd5a4f207e7f9c43b33
+    - https://solus-project.com/sources/mozilla/firefox-57.0.4-langpacks.tar.xz : 6736d27745446fe273f1916c29163d50ad0168fc5cc0844696fbbc115012d901
 license    :
     - GPL-2.0
     - MPL-2.0
@@ -46,7 +46,8 @@
     # Add NSS SQL Compat patch (thanks Fedora)
     %patch -p1 < $pkgfiles/sqlcompat-ff57-1-backport-730495.patch
 
-    install $pkgfiles/config mozconfig
+    cp $pkgfiles/mozilla-api-key .
+    cp $pkgfiles/config mozconfig
     sed 's@\#\#JOBCOUNT\#\#@%JOBS%@' -i mozconfig
 build      : |
     # GCC6 produces completely broken Firefox
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -186,12 +186,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="113">
-            <Date>2017-12-28</Date>
-            <Version>57.0.3</Version>
+        <Update release="114">
+            <Date>2018-01-04</Date>
+            <Version>57.0.4</Version>
             <Comment>Packaging update</Comment>
             <Name>Pierre-Yves</Name>
             <Email>pyu@riseup.net</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file