diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index c197e42..e82fb2b 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat Mar 21 09:03:12 UTC 2015 - wr@rosenauer.org
+
+- update to Firefox 36.0.4 (bnc#923495)
+  * MFSA 2015-28/CVE-2015-0818 (bmo#1144988)
+    Privilege escalation through SVG navigation
+  * MFSA 2015-29/CVE-2015-0817 (bmo#1145255)
+    Code execution through incorrect JavaScript bounds checking
+    elimination
+
 -------------------------------------------------------------------
 Fri Mar 20 15:02:33 UTC 2015 - dimstar@opensuse.org
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index 34dc678..e5f1438 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -19,9 +19,9 @@
 
 # changed with every update
 %define major 36
-%define mainver %major.0.1
+%define mainver %major.0.4
 %define update_channel release
-%define releasedate 2015030500
+%define releasedate 2015032000
 
 # general build definitions
 %if "%{update_channel}" != "aurora"
diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz
index a0730d9..0c9e900 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:0d4bbc9043df092bdf262776e94c2c8575bb18de8bd99529ce83b9907206ffe6
+oid sha256:414f002f062916b91a593ce98d101f331227b4bbde1ec8da0c8816bebbe46311
 size 28428
diff --git a/create-tar.sh b/create-tar.sh
index dc6dd37..990be5f 100644
--- a/create-tar.sh
+++ b/create-tar.sh
@@ -2,8 +2,8 @@
 
 CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_36_0_1_RELEASE"
-VERSION="36.0.1"
+RELEASE_TAG="FIREFOX_36_0_4_RELEASE"
+VERSION="36.0.4"
 
 # mozilla
 if [ -d mozilla ]; then
diff --git a/firefox-36.0.1-source.tar.xz b/firefox-36.0.1-source.tar.xz
deleted file mode 100644
index f65cb0c..0000000
--- a/firefox-36.0.1-source.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:119004f2acfdf153358c39797f3a3b822ed75ad46f8407d4230b72310e4177ee
-size 153254876
diff --git a/firefox-36.0.4-source.tar.xz b/firefox-36.0.4-source.tar.xz
new file mode 100644
index 0000000..5689bc5
--- /dev/null
+++ b/firefox-36.0.4-source.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e40a708f6581a6504445ca139cc6c32e21a4a0c38f30d15176312f059b30107c
+size 153777592
diff --git a/l10n-36.0.1.tar.xz b/l10n-36.0.1.tar.xz
deleted file mode 100644
index 4662a1b..0000000
--- a/l10n-36.0.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cbb8eb7748438db1b53e611274c015cf292dc2985163b58f55ce2059200dddbf
-size 41689728
diff --git a/l10n-36.0.4.tar.xz b/l10n-36.0.4.tar.xz
new file mode 100644
index 0000000..fd94068
--- /dev/null
+++ b/l10n-36.0.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b740a3e35919eb10c154e1be9ad8a0b8ed84fcfe7c72ac7e5e56be3dd99b1939
+size 41685172
diff --git a/source-stamp.txt b/source-stamp.txt
index c7c0080..86089c3 100644
--- a/source-stamp.txt
+++ b/source-stamp.txt
@@ -1,2 +1,2 @@
-REV=152cd2386c2f
+REV=df45b1c67169
 REPO=http://hg.mozilla.org/releases/mozilla-release