diff --git a/.cvsignore b/.cvsignore
index 69cfc84..b99a68b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-thunderbird-langpacks-3.0-20090302.tar.bz2
-thunderbird-3.0b2-source.tar.bz2
+thunderbird-3.0-6a6386c16e98-source.tar.bz2
diff --git a/sources b/sources
index 62110eb..eb244cc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-91bcb8746641112642f043a81cb6d2f8  thunderbird-langpacks-3.0-20090302.tar.bz2
-3a6a95040c4356139a02eab5d32b9ad1  thunderbird-3.0b2-source.tar.bz2
+ec5efa909535d4a764d8a0c0fa5d4a38  thunderbird-3.0-6a6386c16e98-source.tar.bz2
diff --git a/thunderbird.spec b/thunderbird.spec
index 018df3b..4082afc 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -3,23 +3,27 @@
 %define nss_version 3.10
 %define cairo_version 1.0
 %define dbus_glib_version 0.6
+%define version_internal 3.0b3pre
+%define build_langpacks 0
 
 %define official_branding 1
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        3.0
-Release:        2.2.beta2%{?dist}
+Release:        2.3.b3pre.hg.6a6386c16e98%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 %if %{official_branding}
-%define tarball thunderbird-%{version}b2-source.tar.bz2
+%define tarball thunderbird-%{version}-6a6386c16e98-source.tar.bz2
 %else
 %define tarball thunderbird-3.0b2-source.tar.bz2
 %endif
 Source0:        %{tarball}
+%if %{build_langpacks}
 Source1:        thunderbird-langpacks-%{version}-20090302.tar.bz2
+%endif
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
 Source12:       thunderbird-redhat-default-prefs.js
@@ -68,7 +72,7 @@ BuildRequires:  gnome-vfs2-devel
 BuildRequires:  libgnomeui-devel
 Requires:       desktop-file-utils >= %{desktop_file_utils_version}
 
-%define mozappdir %{_libdir}/thunderbird-%{version}b2
+%define mozappdir %{_libdir}/thunderbird-%{version_internal}
 
 AutoProv: 0
 %define _use_internal_dependency_generator 0
@@ -85,8 +89,8 @@ Mozilla Thunderbird is a standalone mail and newsgroup client.
 
 %patch1 -p0 -b .jemalloc
 %patch2 -p1 -b .shared-error
-%patch3 -p0 -b .xulrunner-elif
-%patch4 -p1 -b .pango-fix
+#%patch3 -p0 -b .xulrunner-elif
+#%patch4 -p1 -b .pango-fix
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -152,7 +156,7 @@ desktop-file-install --vendor mozilla \
 
 # set up the thunderbird start script
 rm -f $RPM_BUILD_ROOT/%{_bindir}/thunderbird
-%{__cat} %{SOURCE21} | %{__sed} -e 's,TBIRD_VERSION,%{version}b2,g' > \
+%{__cat} %{SOURCE21} | %{__sed} -e 's,TBIRD_VERSION,%{version_internal},g' > \
   $RPM_BUILD_ROOT%{_bindir}/thunderbird
 %{__chmod} 755 $RPM_BUILD_ROOT/%{_bindir}/thunderbird
 
@@ -188,6 +192,7 @@ cd -
 %{__rm} -f %{name}.lang # Delete for --short-circuit option
 touch %{name}.lang
 
+%if %{build_langpacks}
 %{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/extensions
 %{__tar} xjf %{SOURCE1}
 for langpack in `ls thunderbird-langpacks/*.xpi`; do
@@ -216,7 +221,7 @@ for langpack in `ls thunderbird-langpacks/*.xpi`; do
   echo "%%lang($language) $extensiondir" >> %{name}.lang
 done
 %{__rm} -rf thunderbird-langpacks
-
+%endif # build_langpacks
 
 # Copy over the LICENSE
 cd mozilla