diff --git a/thunderbird-mozconfig b/thunderbird-mozconfig
index e010562..04aefba 100644
--- a/thunderbird-mozconfig
+++ b/thunderbird-mozconfig
@@ -26,6 +26,9 @@ ac_add_options --enable-system-cairo
 ac_add_options --enable-svg
 ac_add_options --enable-canvas
 ac_add_options --disable-crashreporter
+ac_add_options --enable-libxul
+ac_add_options --disable-static
+ac_add_options --enable-system-hunspell
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
diff --git a/thunderbird.spec b/thunderbird.spec
index 35e4e51..5001a19 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -35,6 +35,7 @@ Source100:      find-external-requires
 
 Patch1:         mozilla-jemalloc.patch
 Patch2:         thunderbird-shared-error.patch
+Patch3:         xulrunner-gtk-include.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -86,7 +87,8 @@ Mozilla Thunderbird is a standalone mail and newsgroup client.
 #cd mozilla
 
 %patch1 -p0 -b .jemalloc
-%patch2 -p1 -b .shared-error
+#%patch2 -p1 -b .shared-error
+%patch2 -p1 -b .gtk
 
 %if %{official_branding}
 # Required by Mozilla Corporation