diff --git a/.gitignore b/.gitignore
index b74372c..7e375cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/firefox-24.8.0esr.source.tar.bz2
+SOURCES/firefox-31.2.0esr.source.tar.bz2
diff --git a/.xulrunner.metadata b/.xulrunner.metadata
index b6aadbb..8060bc1 100644
--- a/.xulrunner.metadata
+++ b/.xulrunner.metadata
@@ -1 +1 @@
-7aad03b3152778b1902c102d9c0f99e5528833fa SOURCES/firefox-24.8.0esr.source.tar.bz2
+ca54163c670d9868609254e94bba19d90ac1cf9a SOURCES/firefox-31.2.0esr.source.tar.bz2
diff --git a/SOURCES/disable-webm.patch b/SOURCES/disable-webm.patch
new file mode 100644
index 0000000..570713b
--- /dev/null
+++ b/SOURCES/disable-webm.patch
@@ -0,0 +1,11 @@
+diff -up mozilla-esr31/browser/confvars.sh.webm-fix mozilla-esr31/browser/confvars.sh
+--- mozilla-esr31/browser/confvars.sh.webm-fix	2014-07-21 13:56:53.522253529 +0200
++++ mozilla-esr31/browser/confvars.sh	2014-07-21 13:57:49.983533186 +0200
+@@ -65,6 +65,6 @@ MOZ_PAY=1
+ # Enable activities. These are used for FxOS developers currently.
+ MOZ_ACTIVITIES=1
+ MOZ_JSDOWNLOADS=1
+-MOZ_WEBM_ENCODER=1
++#MOZ_WEBM_ENCODER=1
+ # Enable exact rooting on desktop.
+ JSGC_USE_EXACT_ROOTING=1
diff --git a/SOURCES/firefox-install-dir.patch b/SOURCES/firefox-install-dir.patch
new file mode 100644
index 0000000..c962fa5
--- /dev/null
+++ b/SOURCES/firefox-install-dir.patch
@@ -0,0 +1,12 @@
+diff -up mozilla-aurora/config/baseconfig.mk.orig mozilla-aurora/config/baseconfig.mk
+--- mozilla-aurora/config/baseconfig.mk.orig	2014-05-06 13:17:17.000000000 +0200
++++ mozilla-aurora/config/baseconfig.mk	2014-05-27 17:13:05.215503107 +0200
+@@ -4,7 +4,7 @@
+ # whether a normal build is happening or whether the check is running.
+ includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
+ sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+ ifndef TOP_DIST
+ TOP_DIST = dist
diff --git a/SOURCES/firefox-system-nss-3.16.2.patch b/SOURCES/firefox-system-nss-3.16.2.patch
deleted file mode 100644
index 80a5712..0000000
--- a/SOURCES/firefox-system-nss-3.16.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up firefox-24.3.0/mozilla-esr24/configure.in.nss firefox-24.3.0/mozilla-esr24/configure.in
---- firefox-24.3.0/mozilla-esr24/configure.in.nss	2014-01-30 15:46:38.000000000 +0100
-+++ firefox-24.3.0/mozilla-esr24/configure.in	2014-01-30 17:01:30.614179142 +0100
-@@ -3944,7 +3944,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
-     _USE_SYSTEM_NSS=1 )
- 
- if test -n "$_USE_SYSTEM_NSS"; then
--    AM_PATH_NSS(3.16.2, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
-+    AM_PATH_NSS(3.15.4, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
- fi
- 
- if test -n "$MOZ_NATIVE_NSS"; then
diff --git a/SOURCES/mozilla-906754.patch b/SOURCES/mozilla-906754.patch
deleted file mode 100644
index baf13d7..0000000
--- a/SOURCES/mozilla-906754.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-diff -up mozilla-esr24/xpcom/ds/TimeStamp.cpp.906754 mozilla-esr24/xpcom/ds/TimeStamp.cpp
---- mozilla-esr24/xpcom/ds/TimeStamp.cpp.906754	2013-12-06 03:21:33.000000000 +0100
-+++ mozilla-esr24/xpcom/ds/TimeStamp.cpp	2013-12-20 16:11:06.607243958 +0100
-@@ -13,15 +13,41 @@
- 
- namespace mozilla {
- 
--TimeStamp TimeStamp::sFirstTimeStamp;
--TimeStamp TimeStamp::sProcessCreation;
-+/**
-+ * Wrapper class used to initialize static data used by the TimeStamp class
-+ */
-+struct TimeStampInitialization {
-+  /**
-+   * First timestamp taken when the class static initializers are run. This
-+   * timestamp is used to sanitize timestamps coming from different sources.
-+   */
-+  TimeStamp mFirstTimeStamp;
-+
-+  /**
-+   * Timestamp representing the time when the process was created. This field
-+   * is populated lazily the first time this information is required and is
-+   * replaced every time the process is restarted.
-+   */
-+  TimeStamp mProcessCreation;
-+
-+  TimeStampInitialization() {
-+    TimeStamp::Startup();
-+    mFirstTimeStamp = TimeStamp::Now();
-+  };
-+
-+  ~TimeStampInitialization() {
-+    TimeStamp::Shutdown();
-+  };
-+};
-+
-+static TimeStampInitialization sInitOnce;
- 
- TimeStamp
- TimeStamp::ProcessCreation(bool& aIsInconsistent)
- {
-   aIsInconsistent = false;
- 
--  if (sProcessCreation.IsNull()) {
-+  if (sInitOnce.mProcessCreation.IsNull()) {
-     char *mozAppRestart = PR_GetEnv("MOZ_APP_RESTART");
-     TimeStamp ts;
- 
-@@ -31,7 +57,7 @@ TimeStamp::ProcessCreation(bool& aIsInco
-     if (mozAppRestart && (strcmp(mozAppRestart, "") != 0)) {
-       /* Firefox was restarted, use the first time-stamp we've taken as the new
-        * process startup time and unset MOZ_APP_RESTART. */
--      ts = sFirstTimeStamp;
-+      ts = sInitOnce.mFirstTimeStamp;
-       PR_SetEnv("MOZ_APP_RESTART=");
-     } else {
-       TimeStamp now = Now();
-@@ -39,26 +65,26 @@ TimeStamp::ProcessCreation(bool& aIsInco
- 
-       ts = now - TimeDuration::FromMicroseconds(uptime);
- 
--      if ((ts > sFirstTimeStamp) || (uptime == 0)) {
-+      if ((ts > sInitOnce.mFirstTimeStamp) || (uptime == 0)) {
-         /* If the process creation timestamp was inconsistent replace it with
-          * the first one instead and notify that a telemetry error was
-          * detected. */
-         aIsInconsistent = true;
--        ts = sFirstTimeStamp;
-+        ts = sInitOnce.mFirstTimeStamp;
-       }
-     }
- 
--    sProcessCreation = ts;
-+    sInitOnce.mProcessCreation = ts;
-   }
- 
--  return sProcessCreation;
-+  return sInitOnce.mProcessCreation;
- }
- 
- void
- TimeStamp::RecordProcessRestart()
- {
-   PR_SetEnv("MOZ_APP_RESTART=1");
--  sProcessCreation = TimeStamp();
-+  sInitOnce.mProcessCreation = TimeStamp();
- }
- 
- } // namespace mozilla
-diff -up mozilla-esr24/xpcom/ds/TimeStamp_darwin.cpp.906754 mozilla-esr24/xpcom/ds/TimeStamp_darwin.cpp
---- mozilla-esr24/xpcom/ds/TimeStamp_darwin.cpp.906754	2013-12-06 03:21:33.000000000 +0100
-+++ mozilla-esr24/xpcom/ds/TimeStamp_darwin.cpp	2013-12-20 15:58:50.356993425 +0100
-@@ -114,18 +114,6 @@ TimeDuration::Resolution()
-   return TimeDuration::FromTicks(int64_t(sResolution));
- }
- 
--struct TimeStampInitialization
--{
--  TimeStampInitialization() {
--    TimeStamp::Startup();
--  }
--  ~TimeStampInitialization() {
--    TimeStamp::Shutdown();
--  }
--};
--
--static TimeStampInitialization initOnce;
--
- nsresult
- TimeStamp::Startup()
- {
-@@ -152,8 +140,6 @@ TimeStamp::Startup()
-        sResolutionSigDigs *= 10);
- 
-   gInitialized = true;
--  sFirstTimeStamp = TimeStamp::Now();
--  sProcessCreation = TimeStamp();
- 
-   return NS_OK;
- }
-diff -up mozilla-esr24/xpcom/ds/TimeStamp.h.906754 mozilla-esr24/xpcom/ds/TimeStamp.h
---- mozilla-esr24/xpcom/ds/TimeStamp.h.906754	2013-12-06 03:21:33.000000000 +0100
-+++ mozilla-esr24/xpcom/ds/TimeStamp.h	2013-12-20 15:58:50.356993425 +0100
-@@ -363,19 +363,6 @@ private:
-    * When using a system clock, a value is system dependent.
-    */
-   TimeStampValue mValue;
--
--  /**
--   * First timestamp taken when the class static initializers are run. This
--   * timestamp is used to sanitize timestamps coming from different sources.
--   */
--  static TimeStamp sFirstTimeStamp;
--
--  /**
--   * Timestamp representing the time when the process was created. This field
--   * is populated lazily the first time this information is required and is
--   * replaced every time the process is restarted.
--   */
--  static TimeStamp sProcessCreation;
- };
- 
- }
-diff -up mozilla-esr24/xpcom/ds/TimeStamp_posix.cpp.906754 mozilla-esr24/xpcom/ds/TimeStamp_posix.cpp
---- mozilla-esr24/xpcom/ds/TimeStamp_posix.cpp.906754	2013-12-06 03:21:33.000000000 +0100
-+++ mozilla-esr24/xpcom/ds/TimeStamp_posix.cpp	2013-12-20 15:58:50.356993425 +0100
-@@ -159,17 +159,6 @@ TimeDuration::Resolution()
-   return TimeDuration::FromTicks(int64_t(sResolution));
- }
- 
--struct TimeStampInitialization
--{
--  TimeStampInitialization() {
--    TimeStamp::Startup();
--  }
--  ~TimeStampInitialization() {
--    TimeStamp::Shutdown();
--  }
--};
--
--static TimeStampInitialization initOnce;
- static bool gInitialized = false;
- 
- nsresult
-@@ -192,8 +181,6 @@ TimeStamp::Startup()
-        sResolutionSigDigs *= 10);
- 
-   gInitialized = true;
--  sFirstTimeStamp = TimeStamp::Now();
--  sProcessCreation = TimeStamp();
- 
-   return NS_OK;
- }
-diff -up mozilla-esr24/xpcom/ds/TimeStamp_windows.cpp.906754 mozilla-esr24/xpcom/ds/TimeStamp_windows.cpp
---- mozilla-esr24/xpcom/ds/TimeStamp_windows.cpp.906754	2013-12-06 03:21:33.000000000 +0100
-+++ mozilla-esr24/xpcom/ds/TimeStamp_windows.cpp	2013-12-20 15:58:50.357993430 +0100
-@@ -457,18 +457,6 @@ TimeDuration::Resolution()
-   return TimeDuration::FromTicks(int64_t(sResolution));
- }
- 
--struct TimeStampInitialization
--{
--  TimeStampInitialization() {
--    TimeStamp::Startup();
--  }
--  ~TimeStampInitialization() {
--    TimeStamp::Shutdown();
--  }
--};
--
--static TimeStampInitialization initOnce;
--
- static bool
- HasStableTSC()
- {
-@@ -534,8 +522,6 @@ TimeStamp::Startup()
- 
-   InitThresholds();
-   InitResolution();
--  sFirstTimeStamp = TimeStamp::Now();
--  sProcessCreation = TimeStamp();
- 
-   return NS_OK;
- }
diff --git a/SOURCES/remove-ogg.patch b/SOURCES/remove-ogg.patch
new file mode 100644
index 0000000..9bf924b
--- /dev/null
+++ b/SOURCES/remove-ogg.patch
@@ -0,0 +1,449 @@
+diff -up mozilla-aurora/config/external/moz.build.remove-ogg mozilla-aurora/config/external/moz.build
+--- mozilla-aurora/config/external/moz.build.remove-ogg	2014-05-06 13:17:17.000000000 +0200
++++ mozilla-aurora/config/external/moz.build	2014-06-03 13:51:14.450340480 +0200
+@@ -33,14 +33,15 @@ if CONFIG['MOZ_WEBM_ENCODER']:
+ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ_NATIVE_LIBVPX']:
+     external_dirs += ['media/libvpx']
+ 
++if CONFIG['MOZ_OGG']:
++    external_dirs += ['media/libogg', 'media/libtheora']
++
+ if not CONFIG['MOZ_NATIVE_PNG']:
+     external_dirs += ['media/libpng']
+ 
+ external_dirs += [
+     'media/kiss_fft',
+     'media/libcubeb',
+-    'media/libogg',
+-    'media/libtheora',
+     'media/libspeex_resampler',
+     'media/libsoundtouch',
+ ]
+diff -up mozilla-aurora/configure.in.remove-ogg mozilla-aurora/configure.in
+--- mozilla-aurora/configure.in.remove-ogg	2014-05-06 13:17:17.000000000 +0200
++++ mozilla-aurora/configure.in	2014-06-03 13:51:14.452340483 +0200
+@@ -3938,6 +3938,7 @@ MOZ_FEEDS=1
+ MOZ_WEBAPP_RUNTIME=
+ MOZ_JSDEBUGGER=1
+ MOZ_AUTH_EXTENSION=1
++MOZ_OGG=1
+ MOZ_RAW=
+ MOZ_VORBIS=
+ MOZ_TREMOR=
+@@ -5191,25 +5192,37 @@ fi
+ 
+ AC_SUBST(MOZ_RAW)
+ 
+-dnl Checks for __attribute__(aligned()) directive need by libogg
+-AC_CACHE_CHECK([__attribute__ ((aligned ())) support],
+-    [ac_cv_c_attribute_aligned],
+-    [ac_cv_c_attribute_aligned=0
+-     CFLAGS_save="${CFLAGS}"
+-     CFLAGS="${CFLAGS} -Werror"
+-     for ac_cv_c_attr_align_try in 64 32 16 8; do
+-       echo "trying $ac_cv_c_attr_align_try"
+-       AC_TRY_COMPILE([],
+-                      [static char c __attribute__ ((aligned(${ac_cv_c_attr_align_try}))) = 0; return c;],
+-                      [ac_cv_c_attribute_aligned="${ac_cv_c_attr_align_try}"])
+-       if test "$ac_cv_c_attribute_aligned" != 0; then
+-         break;
+-       fi
+-     done
+-       CFLAGS="${CFLAGS_save}"])
+-if test "${ac_cv_c_attribute_aligned}" != "0"; then
+-  AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX],
+-                     [${ac_cv_c_attribute_aligned}],[Maximum supported data alignment])
++dnl ========================================================
++dnl = Disable Ogg Codecs
++dnl ========================================================
++MOZ_ARG_DISABLE_BOOL(ogg,
++[  --disable-ogg           Disable support for OGG media (Theora video and Vorbis audio)],
++    MOZ_OGG=,
++    MOZ_OGG=1)
++
++if test -n "$MOZ_OGG"; then
++    AC_DEFINE(MOZ_OGG)
++
++    dnl Checks for __attribute__(aligned()) directive
++    AC_CACHE_CHECK([__attribute__ ((aligned ())) support],
++        [ac_cv_c_attribute_aligned],
++        [ac_cv_c_attribute_aligned=0
++         CFLAGS_save="${CFLAGS}"
++         CFLAGS="${CFLAGS} -Werror"
++         for ac_cv_c_attr_align_try in 64 32 16 8; do
++           echo "trying $ac_cv_c_attr_align_try"
++           AC_TRY_COMPILE([],
++                          [static char c __attribute__ ((aligned(${ac_cv_c_attr_align_try}))) = 0; return c;],
++                          [ac_cv_c_attribute_aligned="${ac_cv_c_attr_align_try}"])
++           if test "$ac_cv_c_attribute_aligned" != 0; then
++             break;
++           fi
++         done
++           CFLAGS="${CFLAGS_save}"])
++    if test "${ac_cv_c_attribute_aligned}" != "0"; then
++      AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX],
++                         [${ac_cv_c_attribute_aligned}],[Maximum supported data alignment])
++    fi
+ fi
+ 
+ dnl ========================================================
+@@ -5426,7 +5439,7 @@ AC_SUBST(MOZ_NATIVE_LIBVPX)
+ AC_SUBST(MOZ_LIBVPX_CFLAGS)
+ AC_SUBST(MOZ_LIBVPX_LIBS)
+ 
+-if test "$MOZ_WEBM"; then
++if test "$MOZ_WEBM" -o "$MOZ_OGG"; then
+     if test "$MOZ_SAMPLE_TYPE_FLOAT32"; then
+         MOZ_VORBIS=1
+     else
+@@ -5533,6 +5546,15 @@ dnl ====================================
+ dnl = Handle dependent MEDIA defines
+ dnl ========================================================
+ 
++if test -n "$MOZ_OPUS" -a -z "$MOZ_OGG"; then
++    AC_MSG_ERROR([MOZ_OPUS requires MOZ_OGG which is disabled.])
++fi
++
++if test -n "$MOZ_VORBIS" -a -z "$MOZ_OGG"; then
++    AC_MSG_ERROR([MOZ_VORBIS requires MOZ_OGG which is disabled.
++Note that you need vorbis support for WebM playback.])
++fi
++
+ if test -n "$MOZ_VORBIS" -a -n "$MOZ_TREMOR"; then
+     AC_MSG_ERROR([MOZ_VORBIS and MOZ_TREMOR are mutually exclusive!  The build system should not allow them both to be set, but they are.  Please file a bug at https://bugzilla.mozilla.org/])
+ fi
+@@ -8842,6 +8864,7 @@ AC_SUBST(MOZ_APPLEMEDIA)
+ AC_SUBST(MOZ_OMX_PLUGIN)
+ AC_SUBST(MOZ_VPX_ERROR_CONCEALMENT)
+ AC_SUBST(MOZ_VPX)
++AC_SUBST(MOZ_OGG)
+ AC_SUBST(VPX_AS)
+ AC_SUBST(VPX_ASFLAGS)
+ AC_SUBST(VPX_DASH_C_FLAG)
+diff -up mozilla-aurora/content/html/content/src/HTMLAudioElement.cpp.remove-ogg mozilla-aurora/content/html/content/src/HTMLAudioElement.cpp
+--- mozilla-aurora/content/html/content/src/HTMLAudioElement.cpp.remove-ogg	2014-05-06 13:17:19.000000000 +0200
++++ mozilla-aurora/content/html/content/src/HTMLAudioElement.cpp	2014-06-03 13:51:14.452340483 +0200
+@@ -81,12 +81,16 @@ nsresult HTMLAudioElement::SetAcceptHead
+ #ifdef MOZ_WEBM
+       "audio/webm,"
+ #endif
++#ifdef MOZ_OGG
+       "audio/ogg,"
++#endif
+ #ifdef MOZ_WAVE
+       "audio/wav,"
+ #endif
+       "audio/*;q=0.9,"
++#ifdef MOZ_OGG
+       "application/ogg;q=0.7,"
++#endif
+       "video/*;q=0.6,*/*;q=0.5");
+ 
+     return aChannel->SetRequestHeader(NS_LITERAL_CSTRING("Accept"),
+diff -up mozilla-aurora/content/html/content/src/HTMLVideoElement.cpp.remove-ogg mozilla-aurora/content/html/content/src/HTMLVideoElement.cpp
+--- mozilla-aurora/content/html/content/src/HTMLVideoElement.cpp.remove-ogg	2014-05-06 13:17:19.000000000 +0200
++++ mozilla-aurora/content/html/content/src/HTMLVideoElement.cpp	2014-06-03 13:51:14.452340483 +0200
+@@ -136,9 +136,13 @@ nsresult HTMLVideoElement::SetAcceptHead
+ #ifdef MOZ_WEBM
+       "video/webm,"
+ #endif
++#ifdef MOZ_OGG
+       "video/ogg,"
++#endif
+       "video/*;q=0.9,"
++#ifdef MOZ_OGG
+       "application/ogg;q=0.7,"
++#endif
+       "audio/*;q=0.6,*/*;q=0.5");
+ 
+   return aChannel->SetRequestHeader(NS_LITERAL_CSTRING("Accept"),
+diff -up mozilla-aurora/content/media/DecoderTraits.cpp.remove-ogg mozilla-aurora/content/media/DecoderTraits.cpp
+--- mozilla-aurora/content/media/DecoderTraits.cpp.remove-ogg	2014-05-06 13:17:20.000000000 +0200
++++ mozilla-aurora/content/media/DecoderTraits.cpp	2014-06-03 13:51:14.452340483 +0200
+@@ -13,8 +13,10 @@
+ #include "MediaPluginHost.h"
+ #endif
+ 
++#ifdef MOZ_OGG
+ #include "OggDecoder.h"
+ #include "OggReader.h"
++#endif
+ #ifdef MOZ_WAVE
+ #include "WaveDecoder.h"
+ #include "WaveReader.h"
+@@ -100,6 +102,7 @@ IsRawType(const nsACString& aType)
+ }
+ #endif
+ 
++#ifdef MOZ_OGG
+ // See http://www.rfc-editor.org/rfc/rfc5334.txt for the definitions
+ // of Ogg media types and codec types
+ static const char* const gOggTypes[4] = {
+@@ -131,6 +134,7 @@ IsOggType(const nsACString& aType)
+ 
+   return CodecListContains(gOggTypes, aType);
+ }
++#endif
+ 
+ #ifdef MOZ_WAVE
+ // See http://www.rfc-editor.org/rfc/rfc2361.txt for the definitions
+@@ -199,8 +203,10 @@ IsGStreamerSupportedType(const nsACStrin
+   if (IsWebMType(aMimeType) && !Preferences::GetBool("media.prefer-gstreamer", false))
+     return false;
+ #endif
++#ifdef MOZ_OGG
+   if (IsOggType(aMimeType) && !Preferences::GetBool("media.prefer-gstreamer", false))
+     return false;
++#endif
+ 
+   return GStreamerDecoder::CanHandleMediaType(aMimeType, nullptr);
+ }
+@@ -370,10 +376,12 @@ DecoderTraits::CanHandleMediaType(const
+     result = CANPLAY_MAYBE;
+   }
+ #endif
++#ifdef MOZ_OGG
+   if (IsOggType(nsDependentCString(aMIMEType))) {
+     codecList = MediaDecoder::IsOpusEnabled() ? gOggCodecsWithOpus : gOggCodecs;
+     result = CANPLAY_MAYBE;
+   }
++#endif
+ #ifdef MOZ_WAVE
+   if (IsWaveType(nsDependentCString(aMIMEType))) {
+     codecList = gWaveCodecs;
+@@ -479,10 +487,12 @@ InstantiateDecoder(const nsACString& aTy
+     return decoder.forget();
+   }
+ #endif
++#ifdef MOZ_OGG
+   if (IsOggType(aType)) {
+     decoder = new OggDecoder();
+     return decoder.forget();
+   }
++#endif
+ #ifdef MOZ_WAVE
+   if (IsWaveType(aType)) {
+     decoder = new WaveDecoder();
+@@ -587,9 +597,11 @@ MediaDecoderReader* DecoderTraits::Creat
+     decoderReader = new RawReader(aDecoder);
+   } else
+ #endif
++#ifdef MOZ_OGG
+   if (IsOggType(aType)) {
+     decoderReader = new OggReader(aDecoder);
+   } else
++#endif
+ #ifdef MOZ_WAVE
+   if (IsWaveType(aType)) {
+     decoderReader = new WaveReader(aDecoder);
+@@ -642,7 +654,9 @@ MediaDecoderReader* DecoderTraits::Creat
+ bool DecoderTraits::IsSupportedInVideoDocument(const nsACString& aType)
+ {
+   return
++#ifdef MOZ_OGG
+     IsOggType(aType) ||
++#endif
+ #ifdef MOZ_OMX_DECODER
+     // We support amr inside WebApps on firefoxOS but not in general web content.
+     // Ensure we dont create a VideoDocument when accessing amr URLs directly.
+diff -up mozilla-aurora/content/media/encoder/MediaEncoder.cpp.remove-ogg mozilla-aurora/content/media/encoder/MediaEncoder.cpp
+--- mozilla-aurora/content/media/encoder/MediaEncoder.cpp.remove-ogg	2014-05-06 13:17:20.000000000 +0200
++++ mozilla-aurora/content/media/encoder/MediaEncoder.cpp	2014-06-03 13:51:14.453340485 +0200
+@@ -9,7 +9,9 @@
+ #include "prlog.h"
+ #include "mozilla/Preferences.h"
+ 
++#ifdef MOZ_OGG
+ #include "OggWriter.h"
++#endif
+ #ifdef MOZ_OPUS
+ #include "OpusTrackEncoder.h"
+ 
+@@ -133,6 +135,7 @@ MediaEncoder::CreateEncoder(const nsAStr
+     mimeType = NS_LITERAL_STRING(AUDIO_3GPP);
+   }
+ #endif // MOZ_OMX_ENCODER
++#ifdef MOZ_OGG
+   else if (MediaDecoder::IsOggEnabled() && MediaDecoder::IsOpusEnabled() &&
+            (aMIMEType.EqualsLiteral(AUDIO_OGG) ||
+            (aTrackTypes & ContainerWriter::CREATE_AUDIO_TRACK))) {
+@@ -142,6 +145,7 @@ MediaEncoder::CreateEncoder(const nsAStr
+     NS_ENSURE_TRUE(audioEncoder, nullptr);
+     mimeType = NS_LITERAL_STRING(AUDIO_OGG);
+   }
++#endif  // MOZ_OGG
+   else {
+     LOG(PR_LOG_ERROR, ("Can not find any encoder to record this media stream"));
+     return nullptr;
+diff -up mozilla-aurora/content/media/MediaDecoder.cpp.remove-ogg mozilla-aurora/content/media/MediaDecoder.cpp
+--- mozilla-aurora/content/media/MediaDecoder.cpp.remove-ogg	2014-05-06 13:17:20.000000000 +0200
++++ mozilla-aurora/content/media/MediaDecoder.cpp	2014-06-03 13:51:14.453340485 +0200
+@@ -1653,6 +1653,7 @@ MediaDecoder::IsRawEnabled()
+ }
+ #endif
+ 
++#ifdef MOZ_OGG
+ bool
+ MediaDecoder::IsOpusEnabled()
+ {
+@@ -1668,6 +1669,7 @@ MediaDecoder::IsOggEnabled()
+ {
+   return Preferences::GetBool("media.ogg.enabled");
+ }
++#endif
+ 
+ #ifdef MOZ_WAVE
+ bool
+diff -up mozilla-aurora/content/media/MediaDecoder.h.remove-ogg mozilla-aurora/content/media/MediaDecoder.h
+--- mozilla-aurora/content/media/MediaDecoder.h.remove-ogg	2014-05-06 13:17:20.000000000 +0200
++++ mozilla-aurora/content/media/MediaDecoder.h	2014-06-03 13:51:14.453340485 +0200
+@@ -844,8 +844,10 @@ public:
+   static bool IsRawEnabled();
+ #endif
+ 
++#ifdef MOZ_OGG
+   static bool IsOggEnabled();
+   static bool IsOpusEnabled();
++#endif
+ 
+ #ifdef MOZ_WAVE
+   static bool IsWaveEnabled();
+diff -up mozilla-aurora/content/media/moz.build.remove-ogg mozilla-aurora/content/media/moz.build
+--- mozilla-aurora/content/media/moz.build.remove-ogg	2014-05-06 13:17:20.000000000 +0200
++++ mozilla-aurora/content/media/moz.build	2014-06-03 13:51:14.453340485 +0200
+@@ -7,7 +7,6 @@
+ PARALLEL_DIRS += [
+   'encoder',
+   'mediasource',
+-  'ogg',
+   'webaudio',
+   'webvtt'
+ ]
+@@ -17,6 +16,9 @@ TEST_TOOL_DIRS += ['compiledtest']
+ if CONFIG['MOZ_RAW']:
+     PARALLEL_DIRS += ['raw']
+ 
++if CONFIG['MOZ_OGG']:
++    PARALLEL_DIRS += ['ogg']
++
+ if CONFIG['MOZ_WAVE']:
+     PARALLEL_DIRS += ['wave']
+ 
+diff -up mozilla-aurora/layout/media/symbols.def.in.remove-ogg mozilla-aurora/layout/media/symbols.def.in
+--- mozilla-aurora/layout/media/symbols.def.in.remove-ogg	2014-05-06 13:17:13.000000000 +0200
++++ mozilla-aurora/layout/media/symbols.def.in	2014-06-03 13:51:14.454340486 +0200
+@@ -145,6 +145,7 @@ cubeb_stream_init
+ cubeb_stream_start
+ cubeb_stream_stop
+ cubeb_stream_get_latency
++#ifdef MOZ_OGG
+ th_comment_clear
+ th_comment_init
+ th_decode_alloc
+@@ -158,6 +159,7 @@ th_info_init
+ th_packet_isheader
+ th_packet_iskeyframe
+ th_setup_free
++#endif
+ #ifdef MOZ_OPUS
+ opus_decoder_create
+ opus_decoder_destroy
+diff -up mozilla-aurora/modules/libpref/src/init/all.js.remove-ogg mozilla-aurora/modules/libpref/src/init/all.js
+--- mozilla-aurora/modules/libpref/src/init/all.js.remove-ogg	2014-05-19 11:43:49.000000000 +0200
++++ mozilla-aurora/modules/libpref/src/init/all.js	2014-06-03 13:51:25.028355239 +0200
+@@ -212,7 +212,9 @@ pref("media.fragmented-mp4.use-blank-dec
+ #ifdef MOZ_RAW
+ pref("media.raw.enabled", true);
+ #endif
++#ifdef MOZ_OGG
+ pref("media.ogg.enabled", true);
++#endif
+ #ifdef MOZ_OPUS
+ pref("media.opus.enabled", true);
+ #endif
+diff -up mozilla-aurora/python/mozbuild/mozbuild/mozinfo.py.remove-ogg mozilla-aurora/python/mozbuild/mozbuild/mozinfo.py
+--- mozilla-aurora/python/mozbuild/mozbuild/mozinfo.py.remove-ogg	2014-05-06 13:17:17.000000000 +0200
++++ mozilla-aurora/python/mozbuild/mozbuild/mozinfo.py	2014-06-03 13:51:25.028355239 +0200
+@@ -84,6 +84,7 @@ def build_dict(config, env=os.environ):
+     d['tests_enabled'] = substs.get('ENABLE_TESTS') == "1"
+     d['bin_suffix'] = substs.get('BIN_SUFFIX', '')
+ 
++    d['ogg'] = bool(substs.get('MOZ_OGG'))
+     d['webm'] = bool(substs.get('MOZ_WEBM'))
+     d['wave'] = bool(substs.get('MOZ_WAVE'))
+ 
+diff -up mozilla-aurora/uriloader/exthandler/nsExternalHelperAppService.cpp.remove-ogg mozilla-aurora/uriloader/exthandler/nsExternalHelperAppService.cpp
+--- mozilla-aurora/uriloader/exthandler/nsExternalHelperAppService.cpp.remove-ogg	2014-05-06 13:17:27.000000000 +0200
++++ mozilla-aurora/uriloader/exthandler/nsExternalHelperAppService.cpp	2014-06-03 13:51:25.030355242 +0200
+@@ -462,6 +462,7 @@ static nsDefaultMimeTypeEntry defaultMim
+   { "application/xhtml+xml", "xhtml" },
+   { "application/xhtml+xml", "xht" },
+   { TEXT_PLAIN, "txt" },
++#ifdef MOZ_OGG
+   { VIDEO_OGG, "ogv" },
+   { VIDEO_OGG, "ogg" },
+   { APPLICATION_OGG, "ogg" },
+@@ -469,6 +470,7 @@ static nsDefaultMimeTypeEntry defaultMim
+ #ifdef MOZ_OPUS
+   { AUDIO_OGG, "opus" },
+ #endif
++#endif
+ #ifdef MOZ_WEBM
+   { VIDEO_WEBM, "webm" },
+   { AUDIO_WEBM, "webm" },
+diff -up mozilla-aurora/xpcom/build/nsXPComInit.cpp.remove-ogg mozilla-aurora/xpcom/build/nsXPComInit.cpp
+--- mozilla-aurora/xpcom/build/nsXPComInit.cpp.remove-ogg	2014-06-03 14:04:38.913464144 +0200
++++ mozilla-aurora/xpcom/build/nsXPComInit.cpp	2014-06-03 14:06:03.282582245 +0200
+@@ -133,7 +133,9 @@ extern nsresult nsStringInputStreamConst
+ #include "mozilla/VisualEventTracer.h"
+ #endif
+ 
++#if MOZ_OGG
+ #include "ogg/ogg.h"
++#endif
+ #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING)
+ #include "vpx_mem/vpx_mem.h"
+ #endif
+@@ -378,7 +380,7 @@ private:
+ NS_IMPL_ISUPPORTS(ICUReporter, nsIMemoryReporter)
+ 
+ /* static */ template<> Atomic<size_t> CountingAllocatorBase<ICUReporter>::sAmount(0);
+-
++#if MOZ_OGG
+ class OggReporter MOZ_FINAL : public nsIMemoryReporter,
+                               public CountingAllocatorBase<OggReporter>
+ {
+@@ -420,7 +422,7 @@ NS_IMPL_ISUPPORTS(VPXReporter, nsIMemory
+ 
+ /* static */ template<> Atomic<size_t> CountingAllocatorBase<VPXReporter>::sAmount(0);
+ #endif /* MOZ_VPX */
+-
++#endif /* MOZ_OGG */
+ #ifdef MOZ_WEBM
+ class NesteggReporter MOZ_FINAL : public nsIMemoryReporter
+                                 , public CountingAllocatorBase<NesteggReporter>
+@@ -606,12 +608,13 @@ NS_InitXPCOM2(nsIServiceManager* *result
+     // depend on the XPCOM-based memory reporting goop.  So for now, we have
+     // this oddness.
+     mozilla::SetICUMemoryFunctions();
+-
++#if MOZ_OGG
+     // Do the same for libogg.
+     ogg_set_mem_functions(OggReporter::CountingMalloc,
+                           OggReporter::CountingCalloc,
+                           OggReporter::CountingRealloc,
+                           OggReporter::CountingFree);
++#endif
+ 
+ #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING)
+     // And for VPX.
+@@ -678,7 +681,9 @@ NS_InitXPCOM2(nsIServiceManager* *result
+ 
+     // The memory reporter manager is up and running -- register our reporters.
+     RegisterStrongMemoryReporter(new ICUReporter());
++#if MOZ_OGG
+     RegisterStrongMemoryReporter(new OggReporter());
++#endif
+ #ifdef MOZ_VPX
+     RegisterStrongMemoryReporter(new VPXReporter());
+ #endif
diff --git a/SOURCES/rhbz-1032770.patch b/SOURCES/rhbz-1032770.patch
deleted file mode 100644
index f9f0895..0000000
--- a/SOURCES/rhbz-1032770.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up mozilla-esr24/storage/src/Makefile.in.rhbz-1032770 mozilla-esr24/storage/src/Makefile.in
---- mozilla-esr24/storage/src/Makefile.in.rhbz-1032770	2013-10-22 08:19:20.000000000 +0200
-+++ mozilla-esr24/storage/src/Makefile.in	2013-12-02 14:33:43.524479615 +0100
-@@ -22,14 +22,21 @@ endif
- # Don't use the jemalloc allocator on Android, because we can't guarantee
- # that Gecko will configure sqlite before it is first used (bug 730495).
- #
-+# Don't use the jemalloc allocator when using system sqlite. Linked in libraries
-+# (such as NSS) might trigger an initialization of sqlite and allocation
-+# of memory using the default allocator, prior to the storage service
-+# registering its allocator, causing memory management failures (bug 938730).
-+#
- # Note: On Windows our sqlite build assumes we use jemalloc.  If you disable
- # MOZ_STORAGE_MEMORY on Windows, you will also need to change the "ifdef
- # MOZ_MEMORY" options in db/sqlite3/src/Makefile.in.
- ifdef MOZ_MEMORY
-+ifndef MOZ_NATIVE_SQLITE
- ifneq ($(OS_TARGET), Android)
- DEFINES += -DMOZ_STORAGE_MEMORY
- endif
- endif
-+endif
- 
- # For nsDependentJSString
- LOCAL_INCLUDES = \
diff --git a/SOURCES/xulrunner-24.0-gcc47.patch b/SOURCES/xulrunner-24.0-gcc47.patch
deleted file mode 100644
index a6bff8e..0000000
--- a/SOURCES/xulrunner-24.0-gcc47.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up xulrunner-24.0/mozilla-release/toolkit/crashreporter/client/Makefile.in.gcc47 xulrunner-24.0/mozilla-release/toolkit/crashreporter/client/Makefile.in
---- xulrunner-24.0/mozilla-release/toolkit/crashreporter/client/Makefile.in.gcc47	2013-09-11 01:15:24.000000000 +0200
-+++ xulrunner-24.0/mozilla-release/toolkit/crashreporter/client/Makefile.in	2013-09-13 13:33:49.866875578 +0200
-@@ -60,6 +60,9 @@ $(DIST)/bin/crashreporter.crt: $(topsrcd
- 	$(PYTHON) $(srcdir)/certdata2pem.py < $< > $@
- endif
- 
-+# Needed for moz_free
-+LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
-+
- LIBS += \
-   $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/linux/$(LIB_PREFIX)breakpad_linux_common_s.$(LIB_SUFFIX) \
-   $(NULL)
diff --git a/SOURCES/xulrunner-centos-default-prefs.js b/SOURCES/xulrunner-centos-default-prefs.js
deleted file mode 100644
index e470e95..0000000
--- a/SOURCES/xulrunner-centos-default-prefs.js
+++ /dev/null
@@ -1,15 +0,0 @@
-pref("app.update.enabled", false);
-pref("app.update.autoInstallEnabled", false);
-pref("browser.display.use_system_colors",   true);
-pref("browser.link.open_external",          3);
-pref("general.smoothScroll",                true);
-pref("general.useragent.vendor","CentOS");
-pref("general.useragent.vendorSub", "RPM_VERREL");
-pref("intl.locale.matchOS", true);
-pref("network.manage-offline-status", true);
-pref("toolkit.networkmanager.disable", false);
-pref("offline.autoDetect", true);
-pref("toolkit.storage.synchronous", 0);
-pref("browser.startup.homepage", "http://www.centos.org");
-pref("startup.homepage_override_url", "http://www.centos.org");
-pref("startup.homepage_welcome_url", "http://www.centos.org");
diff --git a/SOURCES/xulrunner-install-dir.patch b/SOURCES/xulrunner-install-dir.patch
deleted file mode 100644
index e788fa0..0000000
--- a/SOURCES/xulrunner-install-dir.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up mozilla-aurora-7676a9a06403/config/baseconfig.mk.dir mozilla-aurora-7676a9a06403/config/baseconfig.mk
---- mozilla-aurora-7676a9a06403/config/baseconfig.mk.dir	2012-09-13 14:18:35.000000000 +0200
-+++ mozilla-aurora-7676a9a06403/config/baseconfig.mk	2012-09-26 10:13:45.258240426 +0200
-@@ -2,7 +2,7 @@ INCLUDED_AUTOCONF_MK = 1
- 
- includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
- idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
- sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
- DIST = $(DEPTH)/dist
- 
-diff -up mozilla-aurora-7676a9a06403/js/src/config/baseconfig.mk.dir mozilla-aurora-7676a9a06403/js/src/config/baseconfig.mk
---- mozilla-aurora-7676a9a06403/js/src/config/baseconfig.mk.dir	2012-09-13 14:18:35.000000000 +0200
-+++ mozilla-aurora-7676a9a06403/js/src/config/baseconfig.mk	2012-09-26 10:14:07.353351833 +0200
-@@ -1,6 +1,6 @@
- INCLUDED_AUTOCONF_MK = 1
- 
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
- sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
- 
- ifneq (,$(filter /%,$(TOP_DIST)))
diff --git a/SOURCES/xulrunner-redhat-default-prefs.js b/SOURCES/xulrunner-redhat-default-prefs.js
index 4d15c04..36e1857 100644
--- a/SOURCES/xulrunner-redhat-default-prefs.js
+++ b/SOURCES/xulrunner-redhat-default-prefs.js
@@ -13,3 +13,8 @@ pref("toolkit.storage.synchronous", 0);
 pref("browser.startup.homepage", "http://www.redhat.com");
 pref("startup.homepage_override_url", "http://www.redhat.com");
 pref("startup.homepage_welcome_url", "http://www.redhat.com");
+pref("javascript.options.baselinejit.content", false);
+pref("javascript.options.baselinejit.chrome", false);
+pref("extensions.shownSelectionUI",         true);
+pref("network.negotiate-auth.allow-insecure-ntlm-v1", true);
+pref("security.use_mozillapkix_verification", false);
diff --git a/SPECS/xulrunner.spec b/SPECS/xulrunner.spec
index 72f58a3..1388df6 100644
--- a/SPECS/xulrunner.spec
+++ b/SPECS/xulrunner.spec
@@ -1,11 +1,11 @@
 # Use system sqlite?
-%define system_sqlite     1
+%define system_sqlite     0
+%define system_ffi        1
 
 # Use system nss/nspr?
 %define system_nss        1
 
-# Enable webm
-%ifarch %{ix86} x86_64
+%ifarch %{ix86} x86_64 ppc ppc64
 %define enable_webm       1
 %else
 %define enable_webm       0
@@ -19,65 +19,40 @@
 
 # Minimal required versions
 %if %{?system_nss}
-%global nspr_version 4.10
-%global nss_version 3.15.4
+%global nspr_version 4.10.6
+%global nss_version 3.16.2
 %endif
 
 %define cairo_version 1.6.0
 %define freetype_version 2.1.9
+%define ffi_version 3.0.9
+%define libvpx_version 1.3.0
+
 # gecko_dir_ver should be set to the version in our directory names
-# alpha_version should be set to the alpha number if using an alpha, 0 otherwise
-# beta_version  should be set to the beta number if using a beta, 0 otherwise
-# rc_version    should be set to the RC number if using an RC, 0 otherwise
 %global gecko_dir_ver %{version}
-%global alpha_version 0
-%global beta_version  0
-%global rc_version    0
 
 %global mozappdir         %{_libdir}/%{name}
 
 %if %{?system_sqlite}
-%define sqlite_version 3.6.22
+%define sqlite_version 3.8.4.2
 # The actual sqlite version (see #480989):
 %global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
 %endif
 
-%global tarballdir  mozilla-esr24
+%global tarballdir  mozilla-esr31
 %global ext_version esr
-
-%if %{alpha_version} > 0
-%global pre_version a%{alpha_version}
-%global pre_name    alpha%{alpha_version}
-%global tarballdir  mozilla-aurora
-%endif
-%if %{beta_version} > 0
-%global pre_version b%{beta_version}
-%global pre_name    beta%{beta_version}
-%global tarballdir  mozilla-beta
-%endif
-%if %{rc_version} > 0
-%global pre_version rc%{rc_version}
-%global pre_name    rc%{rc_version}
-%global tarballdir  mozilla-release
-%global ext_version esr
-%endif
-%if %{defined pre_version}
-%global gecko_verrel %{expand:%%{version}}-%{pre_name}
-%global pre_tag .%{pre_version}
-%else
 %global gecko_verrel %{expand:%%{version}}
-%endif
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        24.8.0
+Version:        31.2.0
 Release:        1%{?pre_tag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 Source0:        ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{ext_version}%{?pre_version}.source.tar.bz2
 Source10:       %{name}-mozconfig
-Source12:       xulrunner-centos-default-prefs.js
+Source12:       %{name}-redhat-default-prefs.js
 Source21:       %{name}.sh.in
 Source23:       %{name}.1
 Source100:      find-external-requires
@@ -85,10 +60,10 @@ Source100:      find-external-requires
 # Xulrunner patches
 # Build patches
 Patch0:         xulrunner-nspr-version.patch
-Patch2:         xulrunner-install-dir.patch
-Patch14:        rhbz-1032770.patch
-Patch15:        firefox-system-nss-3.16.2.patch
+Patch2:         firefox-install-dir.patch
 Patch20:        xulrunner-24.0-jemalloc-ppc.patch
+Patch21:        disable-webm.patch
+Patch22:        remove-ogg.patch
 
 # RHEL specific patches
 Patch51:        mozilla-193-pkgconfig.patch
@@ -97,10 +72,8 @@ Patch54:        rhbz-872752.patch
 Patch55:        rhbz-966424.patch
 
 # RHEL specific patches
-Patch100:       xulrunner-24.0-gcc47.patch
 
 # Upstream patches
-Patch300:       mozilla-906754.patch
 
 # ---------------------------------------------------
 
@@ -129,6 +102,7 @@ BuildRequires:  alsa-lib-devel
 BuildRequires:  libnotify-devel
 BuildRequires:  autoconf213
 BuildRequires:  mesa-libGL-devel
+BuildRequires:  pulseaudio-libs-devel
 
 Requires:       liberation-fonts-common
 Requires:       liberation-sans-fonts
@@ -146,10 +120,13 @@ Requires:       mozilla-filesystem
 BuildRequires:  sqlite-devel >= %{sqlite_version}
 Requires:       sqlite >= %{sqlite_build_version}
 %endif
-
+%if %{?system_ffi}
+BuildRequires:  libffi-devel >= %{ffi_version}
+Requires:       libffi >= %{ffi_version}
+%endif
 %if %{?enable_webm}
-BuildRequires:  libvpx-devel >= 1.0.0
-Requires:       libvpx >= 1.0.0 
+BuildRequires:  libvpx-devel >= %{libvpx_version}
+Requires:       libvpx >= %{libvpx_version}
 %endif
 
 Provides:       gecko-libs = %{gecko_verrel}
@@ -196,7 +173,6 @@ Requires: libXrender-devel
 Requires: startup-notification-devel
 Requires: alsa-lib-devel
 Requires: libnotify-devel
-# RHEL6 specific Requires:
 Requires: cairo-devel >= %{cairo_version}
 Requires: hunspell-devel
 Requires: sqlite-devel
@@ -220,19 +196,15 @@ sed -e 's/__RH_NSPR_VERSION__/%{nspr_version}/' %{P:%%PATCH0} > version.patch
 %{__patch} -p2 -b --suffix .nspr --fuzz=0 < version.patch
 
 %patch2  -p1
-
-%patch14 -p1 -b .1032770
-%patch15 -p2 -b .nss-3.16.2
 %patch20 -p2 -b .jemalloc-ppc
-
+%if !%{?enable_webm}
+%patch21 -p1 -b .disable-webm
+%endif
+%patch22 -p1 -b .ogg
 %patch51 -p2 -b .pk
 %patch54 -p2 -b .embedlink
 %patch55 -p1 -b .973720
 
-%patch100 -p2 -b .gcc-4.7
-
-%patch300 -p1 -b .906754
-
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
 
@@ -260,6 +232,7 @@ echo "ac_add_options --without-system-libvpx" >> .mozconfig
 echo "ac_add_options --disable-webm" >> .mozconfig
 echo "ac_add_options --disable-webrtc" >> .mozconfig
 echo "ac_add_options --disable-ogg" >> .mozconfig
+echo "ac_add_options --disable-opus" >> .mozconfig
 %endif
 
 %ifnarch %{ix86} x86_64
@@ -269,7 +242,6 @@ echo "ac_add_options --disable-polyic" >> .mozconfig
 echo "ac_add_options --disable-tracejit" >> .mozconfig
 %endif
 
-# RHEL 6 mozconfig changes:
 echo "ac_add_options --enable-system-hunspell" >> .mozconfig
 echo "ac_add_options --enable-libnotify" >> .mozconfig
 echo "ac_add_options --enable-startup-notification" >> .mozconfig
@@ -289,6 +261,10 @@ echo "ac_add_options --disable-debug" >> .mozconfig
 echo "ac_add_options --enable-optimize" >> .mozconfig
 %endif
 
+%if %{?system_ffi}
+echo "ac_add_options --enable-system-ffi" >> .mozconfig
+%endif
+
 #---------------------------------------------------------------------
 
 %build
@@ -364,18 +340,12 @@ DESTDIR=$RPM_BUILD_ROOT make -C objdir install STAGE_SDK=1
         $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libxul-embedding-unstable.pc
 
 # Fix multilib devel conflicts...
-%ifarch x86_64 ia64 s390x ppc64
-%define mozbits 64
-%else
-%define mozbits 32
-%endif
-
 function install_file() {
 genheader=$*
-mv ${genheader}.h ${genheader}%{mozbits}.h
+mv ${genheader}.h ${genheader}%{__isa_bits}.h
 cat > ${genheader}.h << EOF
 /* This file exists to fix multilib conflicts */
-#if defined(__x86_64__) || defined(__ia64__) || defined(__s390x__) || defined(__powerpc64__)
+#if defined(__x86_64__) || defined(__ia64__) || defined(__s390x__) || defined(__powerpc64__) || defined(__aarch64__)
 #include "${genheader}64.h"
 #else
 #include "${genheader}32.h"
@@ -402,9 +372,15 @@ for i in *.so; do
 done
 popd
 
+# Move sdk/bin to xulrunner libdir
+pushd $RPM_BUILD_ROOT%{_libdir}/%{name}-devel-%{gecko_dir_ver}/sdk/bin
+mv ply *.py $RPM_BUILD_ROOT%{mozappdir}
+popd
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-devel-%{gecko_dir_ver}/sdk/bin
+
 # Library path
 LD_SO_CONF_D=%{_sysconfdir}/ld.so.conf.d
-LD_CONF_FILE=xulrunner-%{mozbits}.conf
+LD_CONF_FILE=xulrunner-%{__isa_bits}.conf
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}${LD_SO_CONF_D}
 %{__cat} > ${RPM_BUILD_ROOT}${LD_SO_CONF_D}/${LD_CONF_FILE} << EOF
@@ -471,6 +447,9 @@ fi
 %if !%{?system_nss}
 %{mozappdir}/*.chk
 %endif
+%{mozappdir}/install_app.py
+%ghost %{mozappdir}/install_app.pyc
+%ghost %{mozappdir}/install_app.pyo
 
 %files devel
 %defattr(-,root,root,-)
@@ -480,21 +459,34 @@ fi
 %{_libdir}/%{name}-devel-*/*
 %{_libdir}/pkgconfig/*.pc
 %{mozappdir}/xpcshell
-%{mozappdir}/js-gdb.py
-%ghost %{mozappdir}/js-gdb.pyc
-%ghost %{mozappdir}/js-gdb.pyo
+%{mozappdir}/*.py
+%ghost %{mozappdir}/*.pyc
+%ghost %{mozappdir}/*.pyo
+%dir %{mozappdir}/ply
+%{mozappdir}/ply/*.py
+%ghost %{mozappdir}/ply/*.pyc
+%ghost %{mozappdir}/ply/*.pyo
 
 #---------------------------------------------------------------------
 
 %changelog
-* Wed Sep 03 2014 CentOS Sources <bugs@centos.org> - 24.8.0-1.el7.centos
-- Change default prefs to CentOS
+* Tue Oct  7 2014 Jan Horak <jhorak@redhat.com> - 31.2.0-1
+- Update to 31.2.0
+
+* Tue Sep 9 2014 Martin Stransky <stransky@redhat.com> - 31.1.0-3
+- move /sdk/bin to xulrunner libdir
+
+* Mon Sep 8 2014 Martin Stransky <stransky@redhat.com> - 31.1.0-2
+- Sync preferences with Firefox package
+
+* Mon Sep 8 2014 Martin Stransky <stransky@redhat.com> - 31.1.0-1
+- Update to 31.1.0 ESR
 
-* Thu Aug 28 2014 Martin Stransky <stransky@redhat.com> - 24.8.0-1
-- Update to 24.8.0 ESR
+* Thu Aug 14 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 31.0-2
+- Fix header wrapper for aarch64
 
-* Fri Jul 18 2014 Martin Stransky <stransky@redhat.com> - 24.7.0-1
-- Update to 24.7.0 ESR
+* Tue Aug 5 2014 Martin Stransky <stransky@redhat.com> - 31.0-1
+- Update to 31.0 ESR
 
 * Wed Jun  4 2014 Jan Horak <jhorak@redhat.com> - 24.6.0-1
 - Update to 24.6.0 ESR