diff --git a/.gitignore b/.gitignore
index 1e6a347..50c08a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2
 /thunderbird-langpacks-3.1.6-20101027.tar.bz2
 /thunderbird-3.1.7.source.tar.bz2
 /thunderbird-langpacks-3.1.7-20101209.tar.bz2
+/thunderbird-3.1.8.source.tar.bz2
+/thunderbird-langpacks-3.1.8-20110301.tar.bz2
diff --git a/sources b/sources
index e6d100c..2a337ca 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-be64630152a2d5a824a76752594e7596  thunderbird-3.1.7.source.tar.bz2
-8dbaa17d293d3ebdbc9c6d082a1d539d  thunderbird-langpacks-3.1.7-20101209.tar.bz2
+bb4564eba437adceb22292249d186e11  thunderbird-3.1.8.source.tar.bz2
+d9c56e04e9269c2995061010e7c7b842  thunderbird-langpacks-3.1.8-20110301.tar.bz2
diff --git a/thunderbird-mozconfig-debuginfo b/thunderbird-mozconfig-debuginfo
index a0ef07a..4dd2427 100644
--- a/thunderbird-mozconfig-debuginfo
+++ b/thunderbird-mozconfig-debuginfo
@@ -1,5 +1,5 @@
 # For mozilla's debuginfo:
-export CFLAGS="-gstabs+"
-export CXXFLAGS="-gstabs+"
+export CFLAGS="$CFLAGS -gdwarf-2"
+export CXXFLAGS="$CXXFLAGS -gdwarf-2"
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-crashreporter
diff --git a/thunderbird-shared-error.patch b/thunderbird-shared-error.patch
deleted file mode 100644
index 2869fd8..0000000
--- a/thunderbird-shared-error.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up comm-central/mail/installer/Makefile.in.shared-error comm-central/mail/installer/Makefile.in
---- comm-central/mail/installer/Makefile.in.shared-error	2009-09-16 13:47:43.000000000 +0200
-+++ comm-central/mail/installer/Makefile.in	2009-09-16 13:48:25.000000000 +0200
-@@ -95,9 +95,11 @@ endif
- # mozconfig instead.
- ifndef MAIL_PKG_SHARED
- ifndef BUILD_STATIC_LIBS
-+ifeq (BUILD_STATIC_LIBS, 1)
- $(error you need an "--enable-static" build to package a build)
- endif
- endif
-+endif
- 
- include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
- 
-
diff --git a/thunderbird.spec b/thunderbird.spec
index 5a164cb..bceecd7 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -5,11 +5,11 @@
 %define sqlite_version 3.6.14
 %define libnotify_version 0.4
 %define build_langpacks 1
-%define thunderbird_version 3.1.7
+%define thunderbird_version 3.1.8
 %define moz_objdir objdir-tb
 %define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} 
 %define with_lightning_extension 1
-%define lightning_release 0.36.b3pre
+%define lightning_release 0.37.b3pre
 %define lightning_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{e2fda1a4-762b-4020-b5ad-a41df1933103}
 %define gdata_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}
 
@@ -23,7 +23,7 @@
 
 %define official_branding 1
 # enable crash reporter only for iX86
-%ifarch %{ix86}
+%ifarch %{ix86} x86_64
 %define enable_mozilla_crashreporter 1
 %else
 %define enable_mozilla_crashreporter 0
@@ -35,7 +35,7 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        %{thunderbird_version}
-Release:        3%{?dist}
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -47,7 +47,7 @@ Group:          Applications/Internet
 Source0:        %{tarball}
 %if %{build_langpacks}
 # Language package archive is build by RH
-Source1:        thunderbird-langpacks-%{version}-20101209.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20110301.tar.bz2
 %endif
 # Config file for compilation
 Source10:       thunderbird-mozconfig
@@ -70,8 +70,6 @@ Source100:      find-external-requires
 Patch0:         thunderbird-version.patch
 # Fix for jemalloc
 Patch1:         mozilla-jemalloc.patch
-# Fix for installation fail when building with dynamic linked libraries
-Patch2:         thunderbird-shared-error.patch
 # Fixes gcc complain that nsFrame::delete is protected
 Patch4:         xulrunner-1.9.2.1-build.patch
 Patch6:         mozilla-libjpeg-turbo.patch
@@ -156,7 +154,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
 %{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
 
 %patch1 -p0 -b .jemalloc
-%patch2 -p1 -b .shared-error
 %patch4 -p1 -b .protected
 %patch6 -p1 -b .turbo
 %patch7 -p1 -b .mozcflags
@@ -446,6 +443,9 @@ fi
 #===============================================================================
 
 %changelog
+* Tue Mar  1 2011 Jan Horak <jhorak@redhat.com> - 3.1.8-1
+- Update to 3.1.8
+
 * Mon Jan  3 2011 Jan Horak <jhorak@redhat.com> - 3.1.7-3
 - Mozilla crash reporter enabled