diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index e79bfb4..b709ebf 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Jun 23 06:12:45 UTC 2015 - wr@rosenauer.org
+
+- update to Firefox 39.0
+  * Share Hello URLs with social networks
+  * Support for 'switch' role in ARIA 1.1 (web accessibility)
+  * SafeBrowsing malware detection lookups enabled for downloads
+    (Mac OS X and Linux)
+  * Support for new Unicode 8.0 skin tone emoji
+  * Removed support for insecure SSLv3 for network communications
+  * Disable use of RC4 except for temporarily whitelisted hosts
+  * NPAPI Plug-in performance improved via asynchronous initialization
+- dropped mozilla-prefer_plugin_pref.patch as this feature is
+  likely not worth maintaining further
+- rebased patches
+- require NSS 3.19.2
+
 -------------------------------------------------------------------
 Thu Jun 18 10:30:18 UTC 2015 - schwab@suse.de
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index ebe41a1..150181f 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -18,10 +18,10 @@
 
 
 # changed with every update
-%define major 38
-%define mainver %major.0.6
+%define major 39
+%define mainver %major.0
 %define update_channel release
-%define releasedate 2015060500
+%define releasedate 2015062300
 
 # general build definitions
 %if "%{update_channel}" != "aurora"
@@ -77,7 +77,7 @@ BuildRequires:  libnotify-devel
 BuildRequires:  libproxy-devel
 BuildRequires:  makeinfo
 BuildRequires:  mozilla-nspr-devel >= 4.10.8
-BuildRequires:  mozilla-nss-devel >= 3.18.1
+BuildRequires:  mozilla-nss-devel >= 3.19.2
 BuildRequires:  nss-shared-helper-devel
 BuildRequires:  python-devel
 BuildRequires:  startup-notification-devel
@@ -135,7 +135,6 @@ Source16:       MozillaFirefox.changes
 # Gecko/Toolkit
 Patch1:         toolkit-download-folder.patch
 Patch2:         mozilla-nongnome-proxies.patch
-Patch3:         mozilla-prefer_plugin_pref.patch
 Patch4:         mozilla-shared-nss-db.patch
 Patch5:         mozilla-kde.patch
 Patch6:         mozilla-preferences.patch
@@ -251,7 +250,6 @@ symbols meant for upload to Mozilla's crash collector database.
 cd $RPM_BUILD_DIR/mozilla
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz
index c9faeb6..9afff73 100644
--- a/compare-locales.tar.xz
+++ b/compare-locales.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0cbb10f35168010d25744cee97c8cebfa0346f6fbd864b54b28e8be0cdc2c6f8
-size 28472
+oid sha256:3e0a748e563c83db835bda01d5bb1627b5571d8957068b0c91110baf8fc9c310
+size 28428
diff --git a/create-tar.sh b/create-tar.sh
index 3f1655d..4e06f15 100644
--- a/create-tar.sh
+++ b/create-tar.sh
@@ -2,8 +2,8 @@
 
 CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_38_0_6_RELEASE"
-VERSION="38.0.6"
+RELEASE_TAG="FIREFOX_39_0_RELEASE"
+VERSION="39.0"
 
 # mozilla
 if [ -d mozilla ]; then
diff --git a/firefox-38.0.6-source.tar.xz b/firefox-38.0.6-source.tar.xz
deleted file mode 100644
index b6e82f9..0000000
--- a/firefox-38.0.6-source.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cbd312631111b1cbee2b503161e8244849d5cdd613904fd9b6cd3ee66532e9b1
-size 155466612
diff --git a/firefox-39.0-source.tar.xz b/firefox-39.0-source.tar.xz
new file mode 100644
index 0000000..7de479b
--- /dev/null
+++ b/firefox-39.0-source.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:980c9a66aff87ad6c7bd2c8b5cb87914941c87075c6122f9fc586418a62aa601
+size 156257540
diff --git a/firefox-kde.patch b/firefox-kde.patch
index 2658c9a..daa88ea 100644
--- a/firefox-kde.patch
+++ b/firefox-kde.patch
@@ -1,11 +1,11 @@
 # HG changeset patch
-# Parent  14be97741eabce611c291418a4c1774cae8b29ff
+# Parent  cd94ee18bd0cdda7f5eb5503d8d072efe02a8033
 
 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1311 @@
+@@ -0,0 +1,1308 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -669,7 +669,7 @@ new file mode 100644
 +            setfocus="false"
 +            tooltip="tabbrowser-tab-tooltip"
 +            stopwatchid="FX_TAB_CLICK_MS">
-+        <tab class="tabbrowser-tab" selected="true" fadein="true"/>
++        <tab class="tabbrowser-tab" selected="true" visuallyselected="true" fadein="true"/>
 +      </tabs>
 +
 +      <toolbarbutton id="new-tab-button"
@@ -1313,9 +1313,6 @@ new file mode 100644
 +#     starting with an empty iframe here in browser.xul from a Ts standpoint.
 +</deck>
 +
-+<script type="application/javascript" src="chrome://browser/content/pocket/pktApi.js"/>
-+<script type="application/javascript" src="chrome://browser/content/pocket/main.js"/>
-+
 +</window>
 diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
 --- a/browser/base/content/browser.xul
diff --git a/l10n-38.0.6.tar.xz b/l10n-38.0.6.tar.xz
deleted file mode 100644
index 651ffd6..0000000
--- a/l10n-38.0.6.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:feb36822b5fe564a6386b5c6cb94f1f6c2ae26b4248118e05d949eea354c1577
-size 42055888
diff --git a/l10n-39.0.tar.xz b/l10n-39.0.tar.xz
new file mode 100644
index 0000000..1e3bc4f
--- /dev/null
+++ b/l10n-39.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0e2338d351444db95bb3c9abfaa7799f533f9157b65c011fc5b82373ce68b73e
+size 42206764
diff --git a/mozilla-prefer_plugin_pref.patch b/mozilla-prefer_plugin_pref.patch
deleted file mode 100644
index bce8ccc..0000000
--- a/mozilla-prefer_plugin_pref.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Ubuntu
-Subject: introduce a pref to prefer certain plugins for mime-types
-
-diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp
---- a/dom/plugins/base/nsPluginHost.cpp
-+++ b/dom/plugins/base/nsPluginHost.cpp
-@@ -1334,17 +1334,51 @@ nsPluginHost::FindPluginForType(const ch
-   if (!aMimeType) {
-     return nullptr;
-   }
- 
-   LoadPlugins();
- 
-   InfallibleTArray<nsPluginTag*> matchingPlugins;
- 
-+  char *preferredPluginPath = nullptr;
-+  nsAutoCString mimetypePrefString ("modules.plugins.mimetype.");
-+  mimetypePrefString.Append(aMimeType);
-+  const char *mimetypePrefChar = mimetypePrefString.get();
-+  nsAdoptingCString pluginPath = Preferences::GetCString(mimetypePrefChar);
-+  preferredPluginPath = (char*) pluginPath.get();
-+
-   nsPluginTag *plugin = mPlugins;
-+
-+  if(preferredPluginPath) {
-+    while (plugin) {
-+      if (!aCheckEnabled || plugin->IsEnabled()) {
-+        if (0 == PL_strcasecmp(plugin->mFileName.get(), preferredPluginPath) ||
-+            0 == PL_strcasecmp(plugin->mFullPath.get(), preferredPluginPath)) {
-+          matchingPlugins.AppendElement(plugin);
-+        }
-+      }
-+      plugin = plugin->mNext;
-+    }
-+
-+    // now lets search for substrings
-+    plugin = mPlugins;
-+    while (plugin) {
-+      if (!aCheckEnabled || plugin->IsEnabled()) {
-+        if (nullptr != PL_strstr(plugin->mFileName.get(), preferredPluginPath) ||
-+            nullptr != PL_strstr(plugin->mFullPath.get(), preferredPluginPath)) {
-+          matchingPlugins.AppendElement(plugin);
-+        }
-+      }
-+      plugin = plugin->mNext;
-+    }
-+
-+    return FindPreferredPlugin(matchingPlugins);
-+  }
-+
-   while (plugin) {
-     if (!aCheckEnabled || plugin->IsActive()) {
-       int32_t mimeCount = plugin->mMimeTypes.Length();
-       for (int32_t i = 0; i < mimeCount; i++) {
-         if (0 == PL_strcasecmp(plugin->mMimeTypes[i].get(), aMimeType)) {
-           matchingPlugins.AppendElement(plugin);
-           break;
-         }
diff --git a/mozilla-shared-nss-db.patch b/mozilla-shared-nss-db.patch
index d805028..15691b5 100644
--- a/mozilla-shared-nss-db.patch
+++ b/mozilla-shared-nss-db.patch
@@ -7,7 +7,7 @@ References:
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -8207,16 +8207,31 @@ if test "$MOZ_ENABLE_SKIA"; then
+@@ -8247,16 +8247,31 @@ if test "$MOZ_ENABLE_SKIA"; then
      MOZ_ENABLE_SKIA_GPU=1
      AC_DEFINE(USE_SKIA_GPU)
      AC_SUBST(MOZ_ENABLE_SKIA_GPU)
@@ -42,9 +42,9 @@ diff --git a/configure.in b/configure.in
 diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build
 --- a/security/manager/ssl/src/moz.build
 +++ b/security/manager/ssl/src/moz.build
-@@ -77,16 +77,19 @@ SOURCES += [
-     'nsNSSVersion.cpp',
-     'PSMContentListener.cpp',
+@@ -74,16 +74,19 @@ UNIFIED_SOURCES += [
+ SOURCES += [
+     'nsNSSCertificateDB.cpp',
  ]
  
  LOCAL_INCLUDES += [
@@ -87,7 +87,7 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
  #include "nsAppDirectoryServiceDefs.h"
  #include "nsCertVerificationThread.h"
  #include "nsAppDirectoryServiceDefs.h"
-@@ -996,17 +1003,31 @@ nsNSSComponent::InitializeNSS()
+@@ -997,17 +1004,31 @@ nsNSSComponent::InitializeNSS()
    if (NS_FAILED(rv)) {
      nsPSMInitPanic::SetPanic();
      return NS_ERROR_NOT_AVAILABLE;
@@ -123,7 +123,7 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
 diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
 --- a/toolkit/library/moz.build
 +++ b/toolkit/library/moz.build
-@@ -208,16 +208,18 @@ if CONFIG['MOZ_B2G_CAMERA']:
+@@ -207,16 +207,18 @@ if CONFIG['MOZ_B2G_CAMERA'] and CONFIG['
          'stagefright_omx',
      ]
  
diff --git a/source-stamp.txt b/source-stamp.txt
index 3dab63d..2b624b6 100644
--- a/source-stamp.txt
+++ b/source-stamp.txt
@@ -1,2 +1,2 @@
-REV=76f8f33b6577
+REV=034c406f342b
 REPO=http://hg.mozilla.org/releases/mozilla-release