diff --git a/thunderbird-mozconfig b/thunderbird-mozconfig
index 3a8c0c9..b756a7c 100644
--- a/thunderbird-mozconfig
+++ b/thunderbird-mozconfig
@@ -1,7 +1,7 @@
 mk_add_options MOZ_CO_PROJECT=mail
 ac_add_options --enable-application=mail
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir-tb/
-mk_add_options AUTOCONF=autoconf
+mk_add_options AUTOCONF=autoconf-2.13
 
 #ac_add_options --with-system-png
 
diff --git a/thunderbird.spec b/thunderbird.spec
index e266830..b239d70 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -2,6 +2,7 @@
 %define nspr_version 4.6
 %define nss_version 3.10
 %define cairo_version 1.0
+%define dbus_glib_version 0.6
 %define autoconf_version 2.13
 
 %define official_branding 1
@@ -31,6 +32,7 @@ Source100:      find-external-requires
 
 Patch1:         mozilla-jemalloc.patch
 Patch2:         thunderbird-shared-error.patch
+Patch3:         xulrunner-elif.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -49,15 +51,19 @@ Requires:       nss >= %{nss_version}
 %if 0%{?rhel} >= 5
 Requires:       launchmail
 %endif
-BuildRequires:  autoconf = %{autoconf_version}
+BuildRequires:  autoconf213 >= %{autoconf_version}
+BuildRequires:  alsa-lib-devel
+BuildRequires:  libcurl-devel
 BuildRequires:  cairo-devel >= %{cairo_version}
+BuildRequires:  dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires:  libpng-devel, libjpeg-devel, gtk2-devel
 BuildRequires:  zlib-devel, gzip, zip, unzip
 BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  nss-devel >= %{nss_version}
 BuildRequires:  libIDL-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  freetype-devel
+BuildRequires:  pango-devel >= 1.22
+BuildRequires:  freetype-devel >= 2.1.9
 BuildRequires:  libXt-devel
 BuildRequires:  libXrender-devel
 Requires:       desktop-file-utils >= %{desktop_file_utils_version}
@@ -79,6 +85,7 @@ Mozilla Thunderbird is a standalone mail and newsgroup client.
 
 %patch1 -p0 -b .jemalloc
 %patch2 -p1 -b .shared-error
+%patch3 -p0 -b .xulrunner-elif
 
 %if %{official_branding}
 # Required by Mozilla Corporation
diff --git a/xulrunner-elif.patch b/xulrunner-elif.patch
new file mode 100644
index 0000000..f1f4977
--- /dev/null
+++ b/xulrunner-elif.patch
@@ -0,0 +1,12 @@
+diff -up mozilla/toolkit/xre/nsAppRunner.cpp.old mozilla/toolkit/xre/nsAppRunner.cpp
+--- mozilla/toolkit/xre/nsAppRunner.cpp.old	2008-12-10 20:07:01.000000000 +0100
++++ mozilla/toolkit/xre/nsAppRunner.cpp	2009-02-27 17:17:59.000000000 +0100
+@@ -1475,7 +1475,7 @@ XRE_GetBinaryPath(const char* argv0, nsI
+   if (NS_FAILED(rv))
+     return rv;
+ 
+-#elif
++#else
+ #error Oops, you need platform-specific code here
+ #endif
+