diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes
index 250c151..6c46db6 100644
--- a/MozillaThunderbird.changes
+++ b/MozillaThunderbird.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Nov 29 13:47:52 UTC 2010 - wr@rosenauer.org
+
+- security update to version 3.1.7 (bnc#657016)
+  * MFSA 2010-74/CVE-2010-3776/CVE-2010-3777/CVE-2010-3778
+    Miscellaneous memory safety hazards (rv:1.9.2.13/ 1.9.1.16)
+  * MFSA 2010-75/CVE-2010-3769 (bmo#608336)
+    Buffer overflow while line breaking after document.write with
+    long string
+  * MFSA 2010-78/CVE-2010-3768 (bmo#527276)
+    Add support for OTS font sanitizer
+- provide versioned "thunderbird" symbol
+
 -------------------------------------------------------------------
 Wed Oct 27 10:55:39 CEST 2010 - wr@rosenauer.org
 
diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec
index 13543c1..3f956bf 100644
--- a/MozillaThunderbird.spec
+++ b/MozillaThunderbird.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package MozillaThunderbird (Version 3.1.6)
+# spec file for package MozillaThunderbird (Version 3.1.7)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #               2006-2010 Wolfgang Rosenauer <wr@rosenauer.org>
@@ -26,10 +26,11 @@ BuildRequires:  mozilla-nss-devel >= 3.12.8
 BuildRequires:  nss-shared-helper-devel
 %endif
 License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-%define mainversion 3.1.6
+%define mainversion 3.1.7
 Version:        %{mainversion}
 Release:        1
-%define releasedate 2010102600
+%define releasedate 2010120600
+Provides:       thunderbird = %{version}
 Summary:        The Stand-Alone Mozilla Mail Component
 Url:            http://www.mozilla.org/products/thunderbird/
 Group:          Productivity/Networking/Email/Clients
diff --git a/create-tar.sh b/create-tar.sh
index f2878c5..6e6bfb6 100644
--- a/create-tar.sh
+++ b/create-tar.sh
@@ -2,8 +2,8 @@
 
 
 BRANCH="releases/comm-1.9.2" # comm-central
-RELEASE_TAG="THUNDERBIRD_3_1_6_RELEASE"
-VERSION="3.1.6"
+RELEASE_TAG="THUNDERBIRD_3_1_7_RELEASE"
+VERSION="3.1.7"
 
 echo "cloning $BRANCH..."
 hg clone http://hg.mozilla.org/$BRANCH thunderbird
diff --git a/l10n-3.1.6.tar.bz2 b/l10n-3.1.6.tar.bz2
deleted file mode 100644
index 0ad1052..0000000
--- a/l10n-3.1.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:70880360b14b8b808cc2c8a969485587bb2465df655c9f2d07c23045e76e9995
-size 20465554
diff --git a/l10n-3.1.7.tar.bz2 b/l10n-3.1.7.tar.bz2
new file mode 100644
index 0000000..3af457e
--- /dev/null
+++ b/l10n-3.1.7.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:48d19bfe7273164358bfac6f24caa0a76079199af1c9a968b28ee37d21ce3979
+size 20463956
diff --git a/mozilla-gdk-pixbuf.patch b/mozilla-gdk-pixbuf.patch
index df2a1cc..df834f3 100644
--- a/mozilla-gdk-pixbuf.patch
+++ b/mozilla-gdk-pixbuf.patch
@@ -1,9 +1,11 @@
 # HG changeset patch
-# Parent bad58443f421fd09ef6366d359b8405ed50c3731
+# Parent ca3a2bf92df09c5425fa1b2486366d40ed757fa1
+Fix compilation with Gnome > 2.30
+
 diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in
 --- a/toolkit/system/gnome/Makefile.in
 +++ b/toolkit/system/gnome/Makefile.in
-@@ -77,20 +77,22 @@ endif
+@@ -77,21 +77,23 @@ endif
  EXTRA_DSO_LDOPTS += \
  		$(XPCOM_GLUE_LDOPTS) \
  		$(XPCOM_FROZEN_LDOPTS) \
@@ -20,6 +22,7 @@ diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in
  include $(topsrcdir)/config/rules.mk
  
  CXXFLAGS += \
+ 	$(MOZ_GTK2_CFLAGS) \
  	$(MOZ_GCONF_CFLAGS) \
  	$(MOZ_GNOMEVFS_CFLAGS) \
  	$(GLIB_CFLAGS) \
diff --git a/mozilla-shared-nss-db.patch b/mozilla-shared-nss-db.patch
index c0b517a..0bc0d86 100644
--- a/mozilla-shared-nss-db.patch
+++ b/mozilla-shared-nss-db.patch
@@ -7,7 +7,7 @@ References:
 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
 --- a/config/autoconf.mk.in
 +++ b/config/autoconf.mk.in
-@@ -548,16 +548,20 @@ MOZ_ENABLE_LIBNOTIFY	= @MOZ_ENABLE_LIBNO
+@@ -561,16 +561,20 @@ MOZ_ENABLE_LIBNOTIFY	= @MOZ_ENABLE_LIBNO
  
  GLIB_CFLAGS	= @GLIB_CFLAGS@
  GLIB_LIBS	= @GLIB_LIBS@
@@ -31,19 +31,19 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -7756,16 +7756,31 @@ AC_SUBST(MOZ_CAIRO_LIBS)
+@@ -8016,16 +8016,32 @@ AC_SUBST(QCMS_LIBS)
  
- dnl qcms
  dnl ========================================================
- 
- QCMS_LIBS='$(DEPTH)/gfx/qcms/$(LIB_PREFIX)mozqcms.$(LIB_SUFFIX)'
- AC_SUBST(QCMS_LIBS)
+ dnl OTS
+ dnl ========================================================
+ MOZ_OTS_LIBS='$(DEPTH)/gfx/ots/src/$(LIB_PREFIX)mozots.$(LIB_SUFFIX)'
+ AC_SUBST(MOZ_OTS_LIBS)
  
  dnl ========================================================
 +dnl Check for nss-shared-helper
 +dnl ========================================================
 +
-+  PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper, 
++  PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper,
 +   [MOZ_ENABLE_NSSHELPER=1],
 +   [MOZ_ENABLE_NSSHELPER=])
 +
@@ -54,6 +54,7 @@ diff --git a/configure.in b/configure.in
 +AC_SUBST(NSSHELPER_CFLAGS)
 +AC_SUBST(NSSHELPER_LIBS)
 +
++
 +dnl ========================================================
  dnl disable xul
  dnl ========================================================
@@ -115,7 +116,7 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
  
  #include "nsNetUtil.h"
  #include "nsAppDirectoryServiceDefs.h"
-@@ -1600,17 +1607,31 @@ nsNSSComponent::InitializeNSS(PRBool sho
+@@ -1606,17 +1613,31 @@ nsNSSComponent::InitializeNSS(PRBool sho
      // The call to ConfigureInternalPKCS11Token needs to be done before NSS is initialized, 
      // but affects only static data.
      // If we could assume i18n will not change between profiles, one call per application
@@ -127,7 +128,7 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
 -    SECStatus init_rv = ::NSS_InitReadWrite(profileStr.get());
 +    SECStatus init_rv = SECFailure;
 +#ifdef MOZ_ENABLE_NSSHELPER
-+    if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) {
++    if (PR_GetEnv("MOZ_TB_NO_NSSHELPER")) {
 +      init_rv = ::NSS_InitReadWrite(profileStr.get());
 +    } else {
 +      init_rv = ::nsshelp_open_db ("Thunderbird", profileStr.get(), 0);
diff --git a/thunderbird-3.1.6-source.tar.bz2 b/thunderbird-3.1.6-source.tar.bz2
deleted file mode 100644
index e6175b3..0000000
--- a/thunderbird-3.1.6-source.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a50e1754c56c3ef0ff123408e9cadd3eec22081c9bf50ce7759cf419ed3d1c8
-size 66138129
diff --git a/thunderbird-3.1.7-source.tar.bz2 b/thunderbird-3.1.7-source.tar.bz2
new file mode 100644
index 0000000..b3b94a6
--- /dev/null
+++ b/thunderbird-3.1.7-source.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5485eebe3fc886f2fac80bfa1c674e071180ad52bc41348bf349ad2c65570f1b
+size 66095550
diff --git a/thunderbird-shared-nss-db.patch b/thunderbird-shared-nss-db.patch
index f3f3d24..7cd6077 100644
--- a/thunderbird-shared-nss-db.patch
+++ b/thunderbird-shared-nss-db.patch
@@ -7,7 +7,7 @@ References:
 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
 --- a/config/autoconf.mk.in
 +++ b/config/autoconf.mk.in
-@@ -464,16 +464,20 @@ MOZ_PANGO_LIBS          = @MOZ_PANGO_LIB
+@@ -470,16 +470,20 @@ MOZ_PANGO_LIBS          = @MOZ_PANGO_LIB
  XT_LIBS			= @XT_LIBS@
  
  MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS@
@@ -31,13 +31,13 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -6841,16 +6841,31 @@ AC_SUBST(MOZ_CAIRO_LIBS)
+@@ -6999,16 +6999,31 @@ AC_SUBST(QCMS_LIBS)
  
- dnl qcms
  dnl ========================================================
- 
- QCMS_LIBS='$(DEPTH)/mozilla/gfx/qcms/$(LIB_PREFIX)mozqcms.$(LIB_SUFFIX)'    
- AC_SUBST(QCMS_LIBS)
+ dnl OTS
+ dnl ========================================================
+ MOZ_OTS_LIBS='$(DEPTH)/mozilla/gfx/ots/src/$(LIB_PREFIX)mozots.$(LIB_SUFFIX)'
+ AC_SUBST(MOZ_OTS_LIBS)
  
  dnl ========================================================
 +dnl Check for nss-shared-helper