diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index 5c49733..eb327d8 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sat Mar  7 07:40:56 UTC 2015 - wr@rosenauer.org
+
+- update to Firefox 36.0.1
+  Bugfixes:
+  * Disable the usage of the ANY DNS query type (bmo#1093983)
+  * Hello may become inactive until restart (bmo#1137469)
+  * Print preferences may not be preserved (bmo#1136855)
+  * Hello contact tabs may not be visible (bmo#1137141)
+  * Accept hostnames that include an underscore character ("_")
+    (bmo#1136616)
+  * WebGL may use significant memory with Canvas2d (bmo#1137251)
+  * Option -remote has been restored (bmo#1080319)
+- added mozilla-skia-bmo1136958.patch to fix build issues for
+  ARM and PPC
+
 -------------------------------------------------------------------
 Fri Feb 20 22:53:39 UTC 2015 - wr@rosenauer.org
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index 17c53a6..ce5797c 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -19,9 +19,9 @@
 
 # changed with every update
 %define major 36
-%define mainver %major.0
+%define mainver %major.0.1
 %define update_channel release
-%define releasedate 2015022000
+%define releasedate 2015030500
 
 # general build definitions
 %if "%{update_channel}" != "aurora"
@@ -145,6 +145,7 @@ Patch10:        mozilla-icu-strncat.patch
 Patch11:        mozilla-arm-disable-edsp.patch
 Patch12:        mozilla-bmo1088588.patch
 Patch13:        mozilla-openaes-decl.patch
+Patch14:        mozilla-skia-bmo1136958.patch
 # Firefox/browser
 Patch101:       firefox-kde.patch
 Patch102:       firefox-no-default-ualocale.patch
@@ -258,6 +259,7 @@ cd $RPM_BUILD_DIR/mozilla
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 # Firefox
 %patch101 -p1
 %patch102 -p1
diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz
index e50a084..a0730d9 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:587181afe733a26bddb064700720a3c533e3d6c89b93ca5b2a63f9346e5b9636
-size 28472
+oid sha256:0d4bbc9043df092bdf262776e94c2c8575bb18de8bd99529ce83b9907206ffe6
+size 28428
diff --git a/create-tar.sh b/create-tar.sh
index 3cf4e4b..dc6dd37 100644
--- a/create-tar.sh
+++ b/create-tar.sh
@@ -2,8 +2,8 @@
 
 CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_36_0_RELEASE"
-VERSION="36.0"
+RELEASE_TAG="FIREFOX_36_0_1_RELEASE"
+VERSION="36.0.1"
 
 # mozilla
 if [ -d mozilla ]; then
diff --git a/firefox-36.0-source.tar.xz b/firefox-36.0-source.tar.xz
deleted file mode 100644
index ca53df1..0000000
--- a/firefox-36.0-source.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:46dc8d467c0fb364389e7c25dea6f259761fdb0cdfec193f0d6215fa7993f9d9
-size 153244704
diff --git a/firefox-36.0.1-source.tar.xz b/firefox-36.0.1-source.tar.xz
new file mode 100644
index 0000000..f65cb0c
--- /dev/null
+++ b/firefox-36.0.1-source.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:119004f2acfdf153358c39797f3a3b822ed75ad46f8407d4230b72310e4177ee
+size 153254876
diff --git a/l10n-36.0.1.tar.xz b/l10n-36.0.1.tar.xz
new file mode 100644
index 0000000..4662a1b
--- /dev/null
+++ b/l10n-36.0.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cbb8eb7748438db1b53e611274c015cf292dc2985163b58f55ce2059200dddbf
+size 41689728
diff --git a/l10n-36.0.tar.xz b/l10n-36.0.tar.xz
deleted file mode 100644
index b9d5ae2..0000000
--- a/l10n-36.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5ae5f9e0e6e385c18bf836055296386c5694b9c79ec82b413d4e77d8105f39f7
-size 41677544
diff --git a/mozilla-skia-bmo1136958.patch b/mozilla-skia-bmo1136958.patch
new file mode 100644
index 0000000..a330ce0
--- /dev/null
+++ b/mozilla-skia-bmo1136958.patch
@@ -0,0 +1,410 @@
+From 8dc9e73b80ec33fe1a1c855829ef1438301a5de1 Mon Sep 17 00:00:00 2001
+From: Mike Hommey <mh+mozilla@glandium.org>
+Date: Thu, 26 Feb 2015 14:14:02 +0900
+Subject: [PATCH 1/2] Bug 1136958 - Remove duplicate
+ SkDiscardableMemory_none.cpp from gfx/skia/moz.build
+
+And to do so, cleanup gfx/skia/generate_mozbuild.py a little.
+---
+ gfx/skia/generate_mozbuild.py | 53 ++++++++++++++++---------------------------
+ gfx/skia/moz.build            |  1 -
+ 2 files changed, 20 insertions(+), 34 deletions(-)
+
+diff --git a/configure.in b/configure.in
+--- a/configure.in
++++ b/configure.in
+@@ -7997,39 +7997,16 @@ dnl ====================================
+ 
+ if test "${OS_TARGET}" = "WINNT"; then
+   if $PERL -e "exit($MOZ_WINSDK_MAXVER < 0x06020000)"; then
+     MOZ_ENABLE_DIRECT2D1_1=1
+     AC_SUBST(MOZ_ENABLE_DIRECT2D1_1)
+   fi
+ fi
+ 
+-if test "${OS_TARGET}" = "WINNT" -o \
+-        "${OS_ARCH}" = "Darwin" -o \
+-        "${MOZ_WIDGET_TOOLKIT}" = "android" -o \
+-        "${MOZ_WIDGET_TOOLKIT}" = "gonk" -o \
+-        "${MOZ_WIDGET_TOOLKIT}" = "gtk2" -o \
+-        "${MOZ_WIDGET_TOOLKIT}" = "gtk3"; then
+-    case "${target_cpu}" in
+-    i*86*|x86_64|arm)
+-        MOZ_ENABLE_SKIA=1
+-        ;;
+-    *)
+-        MOZ_ENABLE_SKIA=
+-        ;;
+-    esac
+-else
+-MOZ_ENABLE_SKIA=
+-fi
+-
+-MOZ_ARG_ENABLE_BOOL(skia,
+-[  --enable-skia   Enable use of Skia],
+-MOZ_ENABLE_SKIA=1,
+-MOZ_ENABLE_SKIA=)
+-
+ MOZ_ARG_DISABLE_BOOL(skia-gpu,
+ [  --disable-skia-gpu  Disable use of Skia-GPU],
+ MOZ_DISABLE_SKIA_GPU=1,
+ MOZ_DISABLE_SKIA_GPU=)
+ 
+ if test "$USE_FC_FREETYPE"; then
+     if test "$COMPILE_ENVIRONMENT"; then
+         dnl ========================================================
+@@ -8252,30 +8229,26 @@ AC_SUBST(MOZ_TREE_CAIRO)
+ AC_SUBST_LIST(MOZ_CAIRO_CFLAGS)
+ AC_SUBST_LIST(MOZ_CAIRO_LIBS)
+ AC_SUBST_LIST(MOZ_CAIRO_OSLIBS)
+ AC_SUBST(MOZ_TREE_PIXMAN)
+ 
+ dnl ========================================================
+ dnl Skia
+ dnl ========================================================
+-if test "$MOZ_ENABLE_SKIA"; then
+-  AC_DEFINE(MOZ_ENABLE_SKIA)
+-  AC_DEFINE(USE_SKIA)
+-  if test "${MOZ_WIDGET_TOOLKIT}" = "android" -o x"$MOZ_WIDGET_TOOLKIT" = x"gonk"; then
+-    AC_DEFINE(SK_BUILD_FOR_ANDROID_NDK)
+-  fi
+-
+-  if test "${CPU_ARCH}" != "ppc" -a "${CPU_ARCH}" != "ppc64" -a "${CPU_ARCH}" != "sparc" -a -z "$MOZ_DISABLE_SKIA_GPU" ; then
+-    MOZ_ENABLE_SKIA_GPU=1
+-    AC_DEFINE(USE_SKIA_GPU)
+-    AC_SUBST(MOZ_ENABLE_SKIA_GPU)
+-  fi
+-fi
+-AC_SUBST(MOZ_ENABLE_SKIA)
++AC_DEFINE(USE_SKIA)
++if test "${MOZ_WIDGET_TOOLKIT}" = "android" -o x"$MOZ_WIDGET_TOOLKIT" = x"gonk"; then
++  AC_DEFINE(SK_BUILD_FOR_ANDROID_NDK)
++fi
++
++if test "${CPU_ARCH}" != "ppc" -a "${CPU_ARCH}" != "ppc64" -a "${CPU_ARCH}" != "sparc" -a -z "$MOZ_DISABLE_SKIA_GPU" ; then
++  MOZ_ENABLE_SKIA_GPU=1
++  AC_DEFINE(USE_SKIA_GPU)
++  AC_SUBST(MOZ_ENABLE_SKIA_GPU)
++fi
+ 
+ dnl ========================================================
+ dnl Check for nss-shared-helper
+ dnl ========================================================
+ 
+   PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper,
+     [MOZ_ENABLE_NSSHELPER=1],
+     [MOZ_ENABLE_NSSHELPER=])
+diff --git a/gfx/2d/moz.build b/gfx/2d/moz.build
+--- a/gfx/2d/moz.build
++++ b/gfx/2d/moz.build
+@@ -64,51 +64,46 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wi
+         SOURCES += [
+             'DrawTargetD2D1.cpp',
+             'FilterNodeD2D1.cpp',
+             'RadialGradientEffectD2D1.cpp',
+             'SourceSurfaceD2D1.cpp'
+         ]
+         DEFINES['USE_D2D1_1'] = True
+ 
+-if CONFIG['MOZ_ENABLE_SKIA']:
+-    UNIFIED_SOURCES += [
+-        'convolver.cpp',
+-        'DrawTargetSkia.cpp',
+-        'PathSkia.cpp',
+-        'SourceSurfaceSkia.cpp',
+-    ]
+-    SOURCES += [
+-        'image_operations.cpp', # Uses _USE_MATH_DEFINES
+-    ]
+-    EXPORTS.mozilla.gfx += [
+-        'HelpersSkia.h',
+-    ]
++UNIFIED_SOURCES += [
++    'convolver.cpp',
++    'DrawTargetSkia.cpp',
++    'PathSkia.cpp',
++    'SourceSurfaceSkia.cpp',
++]
++SOURCES += [
++    'image_operations.cpp', # Uses _USE_MATH_DEFINES
++]
++EXPORTS.mozilla.gfx += [
++    'HelpersSkia.h',
++]
+ 
+ # Are we targeting x86 or x64?  If so, build SSE2 files.
+ if CONFIG['INTEL_ARCHITECTURE']:
+     # VC2005 doesn't support _mm_castsi128_ps, so SSE2 is turned off
+     if CONFIG['_MSC_VER'] != '1400':
+         SOURCES += [
+             'BlurSSE2.cpp',
++	    'convolverSSE2.cpp',
+             'FilterProcessingSSE2.cpp',
+             'ImageScalingSSE2.cpp',
+         ]
+-        if CONFIG['MOZ_ENABLE_SKIA']:
+-            SOURCES += [
+-                'convolverSSE2.cpp',
+-            ]
+         DEFINES['USE_SSE2'] = True
+         # The file uses SSE2 intrinsics, so it needs special compile flags on some
+         # compilers.
+         SOURCES['BlurSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+         SOURCES['FilterProcessingSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+         SOURCES['ImageScalingSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+-        if CONFIG['MOZ_ENABLE_SKIA']:
+-            SOURCES['convolverSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
++        SOURCES['convolverSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+ 
+ UNIFIED_SOURCES += [
+     'Blur.cpp',
+     'DataSourceSurface.cpp',
+     'DataSurfaceHelpers.cpp',
+     'DrawEventRecorder.cpp',
+     'DrawTarget.cpp',
+     'DrawTargetCairo.cpp',
+diff --git a/gfx/moz.build b/gfx/moz.build
+--- a/gfx/moz.build
++++ b/gfx/moz.build
+@@ -17,16 +17,15 @@ DIRS += [
+     'layers',
+     'graphite2/src',
+     'harfbuzz/src',
+     'ots/src',
+     'thebes',
+     'ipc',
+ ]
+ 
+-if CONFIG['MOZ_ENABLE_SKIA']:
+-    DIRS += ['skia']
++DIRS += ['skia']
+ 
+ if CONFIG['ENABLE_TESTS']:
+     DIRS += ['tests/gtest']
+ 
+ TEST_DIRS += ['tests']
+ 
+diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
+--- a/gfx/skia/generate_mozbuild.py
++++ b/gfx/skia/generate_mozbuild.py
+@@ -1,13 +1,14 @@
+ #!/usr/bin/env python
+ 
+ import os
+ 
+ import locale
++from collections import defaultdict
+ locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
+ 
+ header = """
+ #
+ #   #####   #######           #     #     #     #     #     #
+ # ##     #  #     #          # #    #  #  #    # #     #   #
+ # ##        #     #         #   #   #  #  #   #   #     # #
+ # ##  ####  #     #        #     #  #  #  #  #     #     #
+@@ -187,17 +188,17 @@ def generate_platform_sources():
+ 
+   for plat in platforms:
+     if os.system("cd trunk && GYP_GENERATORS=dump_mozbuild ./gyp_skia -D OS=%s gyp/skia_lib.gyp" % plat) != 0:
+       print 'Failed to generate sources for ' + plat
+       continue
+ 
+ 
+     f = open('trunk/sources.json');
+-    sources[plat] = set(json.load(f));
++    sources[plat] = set(v.replace('../', 'trunk/') for v in json.load(f));
+     f.close()
+ 
+   return dict(sources.items() + generate_opt_sources().items())
+ 
+ 
+ def generate_separated_sources(platform_sources):
+   blacklist = [
+     'ChromeUtils',
+@@ -232,17 +233,17 @@ def generate_separated_sources(platform_
+ 
+   def isblacklisted(value):
+     for item in blacklist:
+       if value.find(item) >= 0:
+         return True
+ 
+     return False
+ 
+-  separated = {
++  separated = defaultdict(set, {
+     'common': {
+       #'trunk/src/effects/gradients/SkGradientTileProc.cpp',
+       'trunk/src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
+       'trunk/src/ports/SkDiscardableMemory_none.cpp',
+       'trunk/src/ports/SkImageDecoder_empty.cpp',
+       'trunk/src/ports/SkMemory_mozalloc.cpp',
+       # 'trunk/src/images/SkImages.cpp',
+       # 'trunk/src/images/SkImageRef.cpp',
+@@ -277,69 +278,55 @@ def generate_separated_sources(platform_
+       'trunk/src/core/SkUtilsArm.cpp',
+     },
+     'neon': {
+       'trunk/src/opts/SkBitmapProcState_arm_neon.cpp',
+     },
+     'none': {
+       'trunk/src/opts/SkUtils_opts_none.cpp',
+     }
+-  }
++  })
+ 
+   for plat in platform_sources.keys():
+-    if not separated.has_key(plat):
+-      separated[plat] = set()
+-
+     for value in platform_sources[plat]:
+       if isblacklisted(value):
+         continue
+ 
+-      if value.find('_SSE') > 0 or value.find('_SSSE') > 0 or value.find('_SSE4') > 0 : #lol
+-        separated['intel'].add(value)
++      if value in separated['common']:
+         continue
+ 
+-      if value.find('_neon') > 0:
+-        separated['neon'].add(value)
+-        continue
++      key = plat
+ 
+-      if value.find('_arm') > 0:
+-        separated['arm'].add(value)
+-        continue
++      if '_SSE' in value or '_SSSE' in value:
++        key = 'intel'
++      elif '_neon' in value:
++        key = 'neon'
++      elif '_arm' in value:
++        key = 'arm'
++      elif '_none' in value:
++        key = 'none'
++      elif all(value in platform_sources.get(p, {})
++               for p in platforms if p != plat):
++        key = 'common'
+ 
+-      if value.find('_none') > 0:
+-        separated['none'].add(value)
+-        continue
+-
+-      found = True
+-      for other in platforms:
+-        if other == plat or not platform_sources.has_key(other):
+-          continue
+-
+-        if not value in platform_sources[other]:
+-          found = False
+-          break;
+-
+-      if found:
+-        separated['common'].add(value)
+-      else:
+-        separated[plat].add(value)
++      separated[key].add(value)
+ 
+   return separated
+ 
+ def uniq(seq):
+   seen = set()
+   seen_add = seen.add
+   return [ x for x in seq if x not in seen and not seen_add(x)]
+ 
+ def write_cflags(f, values, subsearch, cflag, indent):
+   def write_indent(indent):
+     for _ in range(indent):
+         f.write(' ')
+ 
+-  val_list = uniq(sorted(map(lambda val: val.replace('../', 'trunk/'), values), key=lambda x: x.lower()))
++  val_list = uniq(sorted(values, key=lambda x: x.lower()))
+ 
+   if len(val_list) == 0:
+     return
+ 
+   for val in val_list:
+     if val.find(subsearch) > 0:
+       write_indent(indent)
+       f.write("SOURCES[\'" + val + "\'].flags += [\'" + cflag + "\']\n")
+@@ -391,17 +378,17 @@ def write_sources(f, values, indent):
+   write_list(f, "UNIFIED_SOURCES", sources['unified'], indent)
+   write_list(f, "SOURCES", sources['nonunified'], indent)
+   
+ def write_list(f, name, values, indent):
+   def write_indent(indent):
+     for _ in range(indent):
+         f.write(' ')
+ 
+-  val_list = uniq(sorted(map(lambda val: val.replace('../', 'trunk/'), values), key=lambda x: x.lower()))
++  val_list = uniq(sorted(values, key=lambda x: x.lower()))
+ 
+   if len(val_list) == 0:
+     return
+ 
+   write_indent(indent)
+   f.write(name + ' += [\n')
+   for val in val_list:
+     write_indent(indent + 4)
+diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
+--- a/gfx/skia/moz.build
++++ b/gfx/skia/moz.build
+@@ -847,17 +847,16 @@ else:
+         'trunk/src/opts/SkBitmapProcState_opts_none.cpp',
+         'trunk/src/opts/SkBlitMask_opts_none.cpp',
+         'trunk/src/opts/SkBlitRow_opts_none.cpp',
+         'trunk/src/opts/SkBlurImage_opts_none.cpp',
+         'trunk/src/opts/SkMorphology_opts_none.cpp',
+         'trunk/src/opts/SkTextureCompression_opts_none.cpp',
+         'trunk/src/opts/SkUtils_opts_none.cpp',
+         'trunk/src/opts/SkXfermode_opts_none.cpp',
+-        'trunk/src/ports/SkDiscardableMemory_none.cpp',
+     ]
+ 
+ 
+ # can we find a better way of dealing with asm sources?
+ 
+ # left out of UNIFIED_SOURCES for now; that's not C++ anyway, nothing else to unify it with
+ if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
+     SOURCES += [
+diff --git a/image/src/RasterImage.cpp b/image/src/RasterImage.cpp
+--- a/image/src/RasterImage.cpp
++++ b/image/src/RasterImage.cpp
+@@ -2090,20 +2090,16 @@ RasterImage::RecoverFromLossOfFrames()
+   RequestDecodeCore(ASYNCHRONOUS);
+ }
+ 
+ bool
+ RasterImage::CanScale(GraphicsFilter aFilter,
+                       const nsIntSize& aSize,
+                       uint32_t aFlags)
+ {
+-#ifndef MOZ_ENABLE_SKIA
+-  // The high-quality scaler requires Skia.
+-  return false;
+-#else
+   // Check basic requirements: HQ downscaling is enabled, we're decoded, the
+   // flags allow us to do it, and a 'good' filter is being used. The flags may
+   // ask us not to scale because the caller isn't drawing to the window. If
+   // we're drawing to something else (e.g. a canvas) we usually have no way of
+   // updating what we've drawn, so HQ scaling is useless.
+   if (!gfxPrefs::ImageHQDownscalingEnabled() || !mDecoded ||
+       !(aFlags & imgIContainer::FLAG_HIGH_QUALITY_SCALING) ||
+       aFilter != GraphicsFilter::FILTER_GOOD) {
+@@ -2137,17 +2133,16 @@ RasterImage::CanScale(GraphicsFilter aFi
+   // XXX(seth): It's not clear what this check buys us over
+   // gfxPrefs::ImageHQUpscalingMaxSize().
+   // The default value of this pref is 1000, which means that we never upscale.
+   // If that's all it's getting us, I'd rather we just forbid that explicitly.
+   gfx::Size scale(double(aSize.width) / mSize.width,
+                   double(aSize.height) / mSize.height);
+   gfxFloat minFactor = gfxPrefs::ImageHQDownscalingMinFactor() / 1000.0;
+   return (scale.width < minFactor || scale.height < minFactor);
+-#endif
+ }
+ 
+ void
+ RasterImage::NotifyNewScaledFrame()
+ {
+   if (mProgressTracker) {
+     // Send an invalidation so observers will repaint and can take advantage of
+     // the new scaled frame if possible.
diff --git a/source-stamp.txt b/source-stamp.txt
index fd69068..c7c0080 100644
--- a/source-stamp.txt
+++ b/source-stamp.txt
@@ -1,2 +1,2 @@
-REV=59eefd8af5d7
+REV=152cd2386c2f
 REPO=http://hg.mozilla.org/releases/mozilla-release