diff --git a/build-missing-xlocale-h.patch b/build-missing-xlocale-h.patch
new file mode 100644
index 0000000..b4a62b2
--- /dev/null
+++ b/build-missing-xlocale-h.patch
@@ -0,0 +1,12 @@
+diff -up thunderbird-52.3.0/mozilla/intl/icu/source/i18n/digitlst.cpp.xlocale thunderbird-52.3.0/mozilla/intl/icu/source/i18n/digitlst.cpp
+--- thunderbird-52.3.0/mozilla/intl/icu/source/i18n/digitlst.cpp.xlocale	2017-08-24 14:42:48.634084293 +0200
++++ thunderbird-52.3.0/mozilla/intl/icu/source/i18n/digitlst.cpp	2017-08-24 14:42:50.534084676 +0200
+@@ -64,7 +64,7 @@
+ # if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
+ #   include <locale.h>
+ # else
+-#   include <xlocale.h>
++#   include <locale.h>
+ # endif
+ #endif
+ 
diff --git a/firefox-mozconfig b/firefox-mozconfig
index 9182fb2..b47ca41 100644
--- a/firefox-mozconfig
+++ b/firefox-mozconfig
@@ -19,6 +19,7 @@ ac_add_options --enable-chrome-format=omni
 ac_add_options --enable-pulseaudio
 ac_add_options --with-system-icu
 ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
+ac_add_options --with-google-api-keyfile=../google-api-key
 ac_add_options --enable-release
 ac_add_options --enable-pie
 
diff --git a/firefox.spec b/firefox.spec
index 1ea8a09..65d95ea 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -27,7 +27,7 @@
 
 # Use system libicu?
 %if 0%{?fedora} > 27
-%define system_libicu     1
+%define system_libicu     0
 %else
 %define system_libicu     0
 %endif
@@ -90,9 +90,11 @@
 %define enable_mozilla_crashreporter       0
 %if !%{debug_build}
 %ifarch %{ix86} x86_64
+%if 0%{?fedora} < 27
 %define enable_mozilla_crashreporter       1
 %endif
 %endif
+%endif
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
@@ -113,6 +115,7 @@ Source23:       firefox.1
 Source24:       mozilla-api-key
 Source25:       firefox-symbolic.svg
 Source26:       distribution.ini
+Source27:       google-api-key
 
 # Build patches
 Patch0:         firefox-install-dir.patch
@@ -133,6 +136,7 @@ Patch32:        build-rust-ppc64le.patch
 Patch33:        build-ppc-s390-dom.patch
 Patch34:        build-cubeb-pulse-arm.patch
 Patch35:        build-ppc-jit.patch
+Patch36:        build-missing-xlocale-h.patch
 
 # Fedora specific patches
 # Unable to install addons from https pages
@@ -346,6 +350,7 @@ This package contains results of tests executed during build.
 # Patch for big endian platforms only
 %if 0%{?big_endian}
 %patch26 -p1 -b .icu
+%patch37 -p2 -b .xlocale
 %endif
 
 %{__rm} -f .mozconfig
@@ -354,6 +359,7 @@ This package contains results of tests executed during build.
 echo "ac_add_options --enable-official-branding" >> .mozconfig
 %endif
 %{__cp} %{SOURCE24} mozilla-api-key
+%{__cp} %{SOURCE27} google-api-key
 
 %if %{?system_nss}
 echo "ac_add_options --with-system-nspr" >> .mozconfig
diff --git a/google-api-key b/google-api-key
new file mode 100644
index 0000000..06b67f6
--- /dev/null
+++ b/google-api-key
@@ -0,0 +1 @@
+ AIzaSyAUhOVZlk5GiSm5a5_x9vQYkM5oCPUK6tY