diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index 92c3e042..d37320ba 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Apr 28 17:59:27 UTC 2017 - wr@rosenauer.org
+
+- switch to Mozilla's geolocation service (boo#1026989)
+- removed mozilla-preferences.patch obsoleted by overriding via
+  firefox.js
+- fixed KDE integration to avoid crash caused by filepicker
+  (boo#1015998)
+
 -------------------------------------------------------------------
 Wed Apr 12 21:43:16 UTC 2017 - wr@rosenauer.org
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index 3b94658d..6278f322 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -147,6 +147,7 @@ Source14:       create-tar.sh
 Source15:       firefox-appdata.xml
 Source16:       MozillaFirefox.changes
 Source17:       l10n_changesets.txt
+Source18:       mozilla-api-key
 # Gecko/Toolkit
 Patch1:         mozilla-nongnome-proxies.patch
 Patch2:         mozilla-shared-nss-db.patch
@@ -361,6 +362,7 @@ ac_add_options --disable-debug
 ac_add_options --enable-startup-notification
 #ac_add_options --enable-chrome-format=jar
 ac_add_options --enable-update-channel=%{update_channel}
+ac_add_options --with-mozilla-api-keyfile=%{SOURCE18}
 %if %branding
 ac_add_options --enable-official-branding
 %endif
diff --git a/firefox.js b/firefox.js
index 0df9f9e4..857b1534 100644
--- a/firefox.js
+++ b/firefox.js
@@ -1 +1,3 @@
+pref("intl.locale.matchOS", true);
 pref("browser.preferences.instantApply", true);
+pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
diff --git a/mozilla-api-key b/mozilla-api-key
new file mode 100644
index 00000000..0f586ffd
--- /dev/null
+++ b/mozilla-api-key
@@ -0,0 +1 @@
+4605624048be48fda932495844d16fbb
diff --git a/mozilla-kde.patch b/mozilla-kde.patch
index 06a423a6..3dfdfbbb 100644
--- a/mozilla-kde.patch
+++ b/mozilla-kde.patch
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  5f1979729aa3c6bc50f7097202991e73be677e5e
+# Parent  aff14a54f25dc3146ba7a64408ceb9f486a832db
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
@@ -3347,7 +3347,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
  
    mFilters.AppendElement(filter);
    mFilterNames.AppendElement(name);
-@@ -371,16 +375,32 @@ nsFilePicker::Show(int16_t *aReturn)
+@@ -371,16 +375,34 @@ nsFilePicker::Show(int16_t *aReturn)
  
  NS_IMETHODIMP
  nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
@@ -3361,6 +3361,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
 +    int16_t result;
 +    mCallback = aCallback;
 +    mRunning = true;
++    NS_ADDREF_THIS();
 +    kdeFileDialog(&result);
 +    if (mCallback) {
 +      mCallback->Done(result);
@@ -3369,6 +3370,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
 +      mResult = result;
 +    }
 +    mRunning = false;
++    NS_RELEASE_THIS();
 +    return NS_OK;
 +  }
 +
@@ -3380,7 +3382,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
  
    GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
  
-@@ -603,8 +623,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+@@ -603,8 +625,235 @@ nsFilePicker::Done(GtkWidget* file_choos
    if (mCallback) {
      mCallback->Done(result);
      mCallback = nullptr;
diff --git a/mozilla-preferences.patch b/mozilla-preferences.patch
deleted file mode 100644
index 9400723b..00000000
--- a/mozilla-preferences.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Wolfgang Rosenauer <wr@rosenauer.org>
-Subject: use system locale if available
-This setting used to live in the branding-openSUSE package but this is causing too much
-confusion and therefore is currently the only setting we switch in the unbranded
-package unconditionally.
-
-# HG changeset patch
-# Parent 8c1bfc96b05ef1836aad6e9f2af323f63ed1b69c
-# Parent  35b625807600ea4a5a3c49bd1cab22fac5188406
-
-diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
---- a/modules/libpref/init/all.js
-+++ b/modules/libpref/init/all.js
-@@ -1790,17 +1790,17 @@ pref("converter.html2txt.always_include_
- 
- pref("intl.accept_languages",               "chrome://global/locale/intl.properties");
- pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
- pref("intl.menuitems.insertseparatorbeforeaccesskeys","chrome://global/locale/intl.properties");
- pref("intl.charset.detector",               "chrome://global/locale/intl.properties");
- pref("intl.charset.fallback.override",      "");
- pref("intl.charset.fallback.tld",           true);
- pref("intl.ellipsis",                       "chrome://global-platform/locale/intl.properties");
--pref("intl.locale.matchOS",                 false);
-+pref("intl.locale.matchOS",                 true);
- // fallback charset list for Unicode conversion (converting from Unicode)
- // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
- // for ISO-8859-1
- pref("intl.fallbackCharsetList.ISO-8859-1", "windows-1252");
- pref("font.language.group",                 "chrome://global/locale/intl.properties");
- 
- // Android-specific pref to use key-events-only mode for IME-unaware webapps.
- #ifdef MOZ_WIDGET_ANDROID