diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes
index 641e1c0..d5c775d 100644
--- a/MozillaThunderbird.changes
+++ b/MozillaThunderbird.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Jan 10 18:33:52 UTC 2015 - wr@rosenauer.org
+
+- update to Thunderbird 31.4.0 (bnc#910669)
+- added mozilla-icu-strncat.patch to fix post build checks
+
 -------------------------------------------------------------------
 Sun Nov 30 08:37:33 UTC 2014 - wr@rosenauer.org
 
diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec
index 867b233..0473987 100644
--- a/MozillaThunderbird.spec
+++ b/MozillaThunderbird.spec
@@ -1,8 +1,8 @@
 #
 # spec file for package MozillaThunderbird
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
-#               2006-2014 Wolfgang Rosenauer <wr@rosenauer.org>
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#               2006-2015 Wolfgang Rosenauer <wr@rosenauer.org>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 #
 
 
-%define mainversion 31.3.0
+%define mainversion 31.4.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 2014112600
+%define releasedate 2015010900
 Provides:       thunderbird = %{version}
 %if %{with_kde}
 # this is needed to match this package with the kde4 helper package without the main package
@@ -102,6 +102,7 @@ Patch4:         mozilla-kde.patch
 Patch5:         mozilla-arm-disable-edsp.patch
 Patch6:         mozilla-ppc.patch
 Patch7:         mozilla-nullptr-gcc45.patch
+Patch8:         mozilla-icu-strncat.patch
 # Thunderbird/mail
 Patch20:        tb-ssldap.patch
 Patch21:        tb-develdirs.patch
@@ -201,6 +202,7 @@ pushd mozilla
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 popd
 # comm-central patches
 %patch20 -p1
diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz
index 147fab6..d794f69 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:2b10731386db6c9d1cadea28b7949d6f582a92dcc9f4832a7a609acfbfadf3de
-size 28392
+oid sha256:18454e2d3e57ab8249e04fc6784ed55c20cb8cd912eb4a7bf409f64641d324d2
+size 28436
diff --git a/create-tar.sh b/create-tar.sh
index 6876f01..07a965b 100644
--- a/create-tar.sh
+++ b/create-tar.sh
@@ -2,8 +2,8 @@
 
 CHANNEL="esr31"
 BRANCH="releases/comm-$CHANNEL"
-RELEASE_TAG="THUNDERBIRD_31_3_0_RELEASE"
-VERSION="31.3.0"
+RELEASE_TAG="THUNDERBIRD_31_4_0_RELEASE"
+VERSION="31.4.0"
 
 echo "cloning $BRANCH..."
 hg clone http://hg.mozilla.org/$BRANCH thunderbird
diff --git a/l10n-31.3.0.tar.xz b/l10n-31.3.0.tar.xz
deleted file mode 100644
index 3a70c5a..0000000
--- a/l10n-31.3.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0bacd934c06f3f1a1f935fbb86f67c643d25dded1dc12bfc756e02a4257036c8
-size 20750140
diff --git a/l10n-31.4.0.tar.xz b/l10n-31.4.0.tar.xz
new file mode 100644
index 0000000..e812ac8
--- /dev/null
+++ b/l10n-31.4.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c5cab5d083a711ff1ca54f1eb869a5b98002b7c18f0f2d034853ed6830d60c6
+size 20753228
diff --git a/mozilla-icu-strncat.patch b/mozilla-icu-strncat.patch
new file mode 100644
index 0000000..80f4052
--- /dev/null
+++ b/mozilla-icu-strncat.patch
@@ -0,0 +1,35 @@
+# HG changeset patch
+# Parent 29be2a4daa0f512d22bde85b97b5460839026571
+# User Wolfgang Rosenauer <wr@rosenauer.org>
+From: Jan Engelhardt <jengelh@inai.de>
+Reference: http://bugs.icu-project.org/trac/ticket/7808
+
+diff --git a/intl/icu/source/tools/pkgdata/pkgdata.cpp b/intl/icu/source/tools/pkgdata/pkgdata.cpp
+--- a/intl/icu/source/tools/pkgdata/pkgdata.cpp
++++ b/intl/icu/source/tools/pkgdata/pkgdata.cpp
+@@ -1975,22 +1975,22 @@ static void loadLists(UPKGOptions *o, UE
+     FILE *p = NULL;
+     size_t n;
+     static char buf[512] = "";
+     char cmdBuf[1024];
+     UErrorCode status = U_ZERO_ERROR;
+     const char cmd[] = "icu-config --incpkgdatafile";
+ 
+     /* #1 try the same path where pkgdata was called from. */
+-    findDirname(progname, cmdBuf, 1024, &status);
++    findDirname(progname, cmdBuf, sizeof(cmdBuf), &status);
+     if(U_SUCCESS(status)) {
+       if (cmdBuf[0] != 0) {
+-          uprv_strncat(cmdBuf, U_FILE_SEP_STRING, 1024);
++          uprv_strncat(cmdBuf, U_FILE_SEP_STRING, sizeof(cmdBuf)-1-strlen(cmdBuf));
+       }
+-      uprv_strncat(cmdBuf, cmd, 1024);
++      uprv_strncat(cmdBuf, cmd, sizeof(cmdBuf)-1-strlen(cmdBuf));
+       
+       if(verbose) {
+         fprintf(stdout, "# Calling icu-config: %s\n", cmdBuf);
+       }
+       p = popen(cmdBuf, "r");
+     }
+ 
+     if(p == NULL || (n = fread(buf, 1, 511, p)) <= 0) {
diff --git a/thunderbird-31.3.0-source.tar.xz b/thunderbird-31.3.0-source.tar.xz
deleted file mode 100644
index f92412e..0000000
--- a/thunderbird-31.3.0-source.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6a51acc67b69b1d4fe4f64c67af969eb942e1534cd6dc7e30050f73e92fc206e
-size 144784388
diff --git a/thunderbird-31.4.0-source.tar.xz b/thunderbird-31.4.0-source.tar.xz
new file mode 100644
index 0000000..80e4d0b
--- /dev/null
+++ b/thunderbird-31.4.0-source.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac84cfba9e1c5c5888fdcfc8770091928e5761dc44aa89c456d738652c8e3540
+size 144798452