diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes
index beaf570..26a5a1a 100644
--- a/MozillaThunderbird.changes
+++ b/MozillaThunderbird.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Fri Mar 25 08:50:30 UTC 2011 - idoenmez@novell.com
+
+- Add mozilla-gcc46.patch: fix compilation with gcc 4.6
+  See the following bug reports:
+    https://bugzilla.mozilla.org/show_bug.cgi?id=623116
+    https://bugzilla.mozilla.org/show_bug.cgi?id=623123
+    https://bugzilla.mozilla.org/show_bug.cgi?id=623126
+    https://bugzilla.mozilla.org/show_bug.cgi?id=628371 
+
+-------------------------------------------------------------------
+Tue Feb 22 08:51:12 UTC 2011 - wr@rosenauer.org
+
+- security update to version 3.1.8 (build3) (bnc#667155)
+  * MFSA 2011-01/CVE-2011-0053/CVE-2011-0062
+    Miscellaneous memory safety hazards (rv:1.9.2.14/ 1.9.1.17)
+  * MFSA 2011-08/CVE-2010-1585 (bmo#562547)
+    ParanoidFragmentSink allows javascript: URLs in chrome documents
+  * MFSA 2011-09/CVE-2011-0061 (bmo#610601)
+    Crash caused by corrupted JPEG image
+
 -------------------------------------------------------------------
 Thu Jan 13 13:08:39 UTC 2011 - wr@rosenauer.org
 
diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec
index 31b2bf4..139a2ba 100644
--- a/MozillaThunderbird.spec
+++ b/MozillaThunderbird.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package MozillaThunderbird
+# spec file for package MozillaThunderbird (Version 3.1.8)
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #               2006-2011 Wolfgang Rosenauer <wr@rosenauer.org>
@@ -26,10 +26,10 @@ BuildRequires:  mozilla-nss-devel >= 3.12.8
 BuildRequires:  nss-shared-helper-devel
 %endif
 License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-%define mainversion 3.1.7
+%define mainversion 3.1.8
 Version:        %{mainversion}
-Release:        3
-%define releasedate 2010120600
+Release:        1
+%define releasedate 2011022100
 Provides:       thunderbird = %{version}
 Summary:        The Stand-Alone Mozilla Mail Component
 Url:            http://www.mozilla.org/products/thunderbird/
@@ -52,6 +52,7 @@ Patch9:         mozilla-shared-nss-db.patch
 Patch10:        mozilla-gdk-pixbuf.patch
 Patch11:        thunderbird-shared-nss-db.patch
 Patch13:        mozilla-xsmp.patch
+Patch14:        mozilla-gcc46.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         coreutils fileutils textutils /bin/sh
 ### build options
@@ -139,7 +140,7 @@ symbols meant for upload to Mozilla's crash collector database.
 
 %package -n enigmail
 Version:        1.1.2
-Release:        9
+Release:        7
 License:        GPLv2+ ; MPLv1.1+
 Summary:        OpenPGP addon for Thunderbird and SeaMonkey
 Group:          Productivity/Networking/Email/Clients
@@ -166,6 +167,7 @@ pushd mozilla
 %patch9 -p1
 %patch10 -p1
 %patch13 -p1
+%patch14 -p1
 popd
 # comm-central patches
 %patch2 -p1
diff --git a/create-tar.sh b/create-tar.sh
index 6e6bfb6..5f37905 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_7_RELEASE"
-VERSION="3.1.7"
+RELEASE_TAG="THUNDERBIRD_3_1_8_RELEASE"
+VERSION="3.1.8"
 
 echo "cloning $BRANCH..."
 hg clone http://hg.mozilla.org/$BRANCH thunderbird
@@ -13,7 +13,7 @@ echo "running client.py..."
 [ "$RELEASE_TAG" == "default" ] || _extra="--comm-rev=$RELEASE_TAG --mozilla-rev=$RELEASE_TAG"
 # temporary!
 _extra="--mozilla-repo=http://hg.mozilla.org/releases/mozilla-1.9.2 $_extra"
-python client.py checkout --skip-chatzilla --skip-venkman $_extra 
+python client.py checkout --skip-chatzilla --skip-venkman $_extra
 popd
 echo "creating archive..."
 tar cjf thunderbird-$VERSION-source.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS thunderbird
diff --git a/l10n-3.1.7.tar.bz2 b/l10n-3.1.7.tar.bz2
deleted file mode 100644
index 3af457e..0000000
--- a/l10n-3.1.7.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:48d19bfe7273164358bfac6f24caa0a76079199af1c9a968b28ee37d21ce3979
-size 20463956
diff --git a/l10n-3.1.8.tar.bz2 b/l10n-3.1.8.tar.bz2
new file mode 100644
index 0000000..ec7db6f
--- /dev/null
+++ b/l10n-3.1.8.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:794423d6c7116ee17bf7611a83cc198578345f3f40768ac501584b3d9e54a521
+size 20470032
diff --git a/mozilla-gcc46.patch b/mozilla-gcc46.patch
new file mode 100644
index 0000000..425dfb7
--- /dev/null
+++ b/mozilla-gcc46.patch
@@ -0,0 +1,105 @@
+See the following bug reports;
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=623116
+https://bugzilla.mozilla.org/show_bug.cgi?id=623123
+https://bugzilla.mozilla.org/show_bug.cgi?id=623126
+https://bugzilla.mozilla.org/show_bug.cgi?id=628371
+
+diff --git a/xpcom/base/nsDebugImpl.h b/xpcom/base/nsDebugImpl.h
+--- a/xpcom/base/nsDebugImpl.h
++++ b/xpcom/base/nsDebugImpl.h
+@@ -40,6 +40,7 @@
+ class nsDebugImpl : public nsIDebug2
+ {
+ public:
++    nsDebugImpl() {}
+     NS_DECL_ISUPPORTS
+     NS_DECL_NSIDEBUG
+     NS_DECL_NSIDEBUG2
+diff --git a/xpcom/base/nsTraceRefcntImpl.h b/xpcom/base/nsTraceRefcntImpl.h
+--- a/xpcom/base/nsTraceRefcntImpl.h
++++ b/xpcom/base/nsTraceRefcntImpl.h
+@@ -44,6 +44,7 @@
+ class nsTraceRefcntImpl : public nsITraceRefcnt
+ {
+ public:
++  nsTraceRefcntImpl() {}
+   NS_DECL_ISUPPORTS
+   NS_DECL_NSITRACEREFCNT
+ 
+diff --git a/xpcom/glue/nsEnumeratorUtils.cpp b/xpcom/glue/nsEnumeratorUtils.cpp
+--- a/xpcom/glue/nsEnumeratorUtils.cpp
++++ b/xpcom/glue/nsEnumeratorUtils.cpp
+@@ -52,6 +52,7 @@ class EmptyEnumeratorImpl : public nsISi
+                             public nsIStringEnumerator
+ {
+ public:
++    EmptyEnumeratorImpl() {}
+     // nsISupports interface
+     NS_DECL_ISUPPORTS_INHERITED  // not really inherited, but no mRefCnt
+ 
+diff --git a/xpcom/io/nsUnicharInputStream.h b/xpcom/io/nsUnicharInputStream.h
+--- a/xpcom/io/nsUnicharInputStream.h
++++ b/xpcom/io/nsUnicharInputStream.h
+@@ -51,6 +51,7 @@ class nsSimpleUnicharStreamFactory :
+   private nsISimpleUnicharStreamFactory
+ {
+ public:
++  nsSimpleUnicharStreamFactory() {}
+   NS_DECL_ISUPPORTS_INHERITED
+   NS_DECL_NSIFACTORY
+   NS_DECL_NSISIMPLEUNICHARSTREAMFACTORY
+diff --git a/intl/unicharutil/util/nsUnicharUtils.h b/intl/unicharutil/util/nsUnicharUtils.h
+--- a/intl/unicharutil/util/nsUnicharUtils.h
++++ b/intl/unicharutil/util/nsUnicharUtils.h
+@@ -103,6 +103,7 @@ public:
+ class nsCaseInsensitiveStringComparator : public nsStringComparator
+ {
+ public:
++  nsCaseInsensitiveStringComparator() {}
+   virtual int operator() (const PRUnichar*,
+                           const PRUnichar*,
+                           PRUint32 aLength) const;
+diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -616,6 +616,7 @@ class nsXULAppInfo : public nsIXULAppInf
+ 
+ {
+ public:
++  nsXULAppInfo() {}
+   NS_DECL_ISUPPORTS_INHERITED
+   NS_DECL_NSIXULAPPINFO
+   NS_DECL_NSIXULRUNTIME
+diff --git a/embedding/browser/gtk/src/EmbedPrivate.cpp b/embedding/browser/gtk/src/EmbedPrivate.cpp
+index 57fd9b1..0052ca7 100644
+--- a/embedding/browser/gtk/src/EmbedPrivate.cpp
++++ b/embedding/browser/gtk/src/EmbedPrivate.cpp
+@@ -99,6 +99,7 @@ nsIDirectoryServiceProvider *EmbedPrivate::sAppFileLocProvider = nsnull;
+ class GTKEmbedDirectoryProvider : public nsIDirectoryServiceProvider2
+ {
+ public:
++  GTKEmbedDirectoryProvider() {}
+   NS_DECL_ISUPPORTS_INHERITED
+   NS_DECL_NSIDIRECTORYSERVICEPROVIDER
+   NS_DECL_NSIDIRECTORYSERVICEPROVIDER2
+--- a/gfx/ots/src/os2.cc	2011-02-22 09:34:58.000000000 +0100
++++ b/gfx/ots/src/os2.cc	2011-03-25 10:08:02.183485823 +0100
+@@ -5,6 +5,7 @@
+ #include "os2.h"
+ 
+ #include "head.h"
++#include <stddef.h>
+ 
+ // OS/2 - OS/2 and Windows Metrics
+ // http://www.microsoft.com/opentype/otspec/os2.htm
+--- a/toolkit/crashreporter/google-breakpad/src/common/linux/language.cc	2011-02-22 09:35:48.000000000 +0100
++++ b/toolkit/crashreporter/google-breakpad/src/common/linux/language.cc	2011-03-25 10:33:34.367485573 +0100
+@@ -39,6 +39,7 @@
+ // C++ language-specific operations.
+ class CPPLanguage: public Language {
+  public:
++  CPPLanguage() {};
+   string MakeQualifiedName(const string &parent_name,
+                            const string &name) const {
+     if (parent_name.empty())
diff --git a/thunderbird-3.1.7-source.tar.bz2 b/thunderbird-3.1.7-source.tar.bz2
deleted file mode 100644
index b3b94a6..0000000
--- a/thunderbird-3.1.7-source.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5485eebe3fc886f2fac80bfa1c674e071180ad52bc41348bf349ad2c65570f1b
-size 66095550
diff --git a/thunderbird-3.1.8-source.tar.bz2 b/thunderbird-3.1.8-source.tar.bz2
new file mode 100644
index 0000000..c3fb845
--- /dev/null
+++ b/thunderbird-3.1.8-source.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e9c1a0ae476eb7a89a5708c4e7a79dabb0ea6aba07c4ad2ba9c38f63e66e1ffc
+size 68304315