diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes
index 01c934b..50c41e7 100644
--- a/MozillaThunderbird.changes
+++ b/MozillaThunderbird.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Mar 31 05:02:16 UTC 2015 - wr@rosenauer.org
+
+- update to Thunderbird 31.6.0 (bnc#925368)
+  * MFSA 2015-30/CVE-2015-0815
+    Miscellaneous memory safety hazards
+  * MFSA 2015-31/CVE-2015-0813 (bmo#1106596))
+    Use-after-free when using the Fluendo MP3 GStreamer plugin
+  * MFSA 2015-33/CVE-2015-0816 (bmo#1144991)
+    resource:// documents can load privileged pages
+  * MFSA-2015-37/CVE-2015-0807 (bmo#1111834)
+    CORS requests should not follow 30x redirections after preflight
+  * MFSA-2015-40/CVE-2015-0801 (bmo#1146339)
+    Same-origin bypass through anchor navigation
+
 -------------------------------------------------------------------
 Mon Feb 23 12:42:57 UTC 2015 - wr@rosenauer.org
 
diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec
index 5bebc85..d667c55 100644
--- a/MozillaThunderbird.spec
+++ b/MozillaThunderbird.spec
@@ -17,7 +17,7 @@
 #
 
 
-%define mainversion 31.5.0
+%define mainversion 31.6.0
 %define update_channel release
 
 %if %suse_version > 1210
@@ -70,7 +70,7 @@ Recommends:     gstreamer-0_10-plugins-ffmpeg
 %endif
 Version:        %{mainversion}
 Release:        0
-%define releasedate 2015022200
+%define releasedate 2015032900
 Provides:       thunderbird = %{version}
 %if %{with_kde}
 # this is needed to match this package with the kde4 helper package without the main package
diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz
index 371bb80..1f0ce7b 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:546caffa4a7fc3a5fb76aa6d6c8e42d745dd2ea5c2d361510ce7af5e154afc52
-size 28412
+oid sha256:fc979bb1a6c993809e4f21bd5c9657fc3327f64960efe722a2081dcbcd75a68d
+size 28408
diff --git a/create-tar.sh b/create-tar.sh
index b6b4063..ce1e3bb 100644
--- a/create-tar.sh
+++ b/create-tar.sh
@@ -2,8 +2,8 @@
 
 CHANNEL="esr31"
 BRANCH="releases/comm-$CHANNEL"
-RELEASE_TAG="THUNDERBIRD_31_5_0_RELEASE"
-VERSION="31.5.0"
+RELEASE_TAG="THUNDERBIRD_31_6_0_RELEASE"
+VERSION="31.6.0"
 
 echo "cloning $BRANCH..."
 hg clone http://hg.mozilla.org/$BRANCH thunderbird
diff --git a/l10n-31.5.0.tar.xz b/l10n-31.5.0.tar.xz
deleted file mode 100644
index f56e717..0000000
--- a/l10n-31.5.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:01d34f0fd0a1e57994e2e7e10936bab3ce7dccdae5ce99d123b12d5bb064ccfd
-size 20770696
diff --git a/l10n-31.6.0.tar.xz b/l10n-31.6.0.tar.xz
new file mode 100644
index 0000000..a1d23a4
--- /dev/null
+++ b/l10n-31.6.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b5c51d858996508e3dd7de7bac4910fd901fe5b90278a645a21ce17a10265776
+size 20729932
diff --git a/thunderbird-31.5.0-source.tar.xz b/thunderbird-31.5.0-source.tar.xz
deleted file mode 100644
index d942927..0000000
--- a/thunderbird-31.5.0-source.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eb060f1e4c947c6f755a2e3a9ffddf121553dc8262d14ce78d8fdcfc0485b8db
-size 144781972
diff --git a/thunderbird-31.6.0-source.tar.xz b/thunderbird-31.6.0-source.tar.xz
new file mode 100644
index 0000000..54a39fe
--- /dev/null
+++ b/thunderbird-31.6.0-source.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6d2e87448770800503dcf7a23b78b892e925d953fd2651b4c93f4defaea626da
+size 144813956